I'm using git behind svn, and for each branch I have, I need to do a full build (which takes a few minutes). These build files should NOT be checked in, but they are intermingled with user-modified files, which means I cannot just exclude the directory. The user-modified files are likely to change, also, which means I can't make special ...
I've tried git branch -r, but that only lists remote branches that I've tracked locally. How do I find the list of those that I haven't? (It doesn't matter to me whether the command lists all remote branches or only those that are untracked.) ...
After creating a branch with --track (or leaving the default, or --notrack), you later wish to be reminded of what a branch is tracking. Is there a way, other than searching through the .git/config file, to display what a branch is tracking? ...
Is there a way to show only the branch structure in Git? There are a number of tools that show the commits graphically, but in my case the list is so long that it's impossible to see the structure. I guess git-log could be the answer, but I can't find any switches that only show the branching commits. This along with "--graph --branches ...
I'm trying to learn how to use Git effectively and I'm wondering how I should (good practice/bad practice?) solve the following case: Say I have the following chain of commits in master: Initial commit Commit 1 Commit 2 Commit 3 Then I realize that what's done in the last two commits is completely wrong and I need to start from Comm...
I have a master branch and would like to create a new branch based on it, and then switch to the new branch. I'm very very new to coda/github/terminal so I don't even know if my syntax is correct. here's what I typed in, letter for letter, with the exception of the branch names which are placeholders: git checkout -b $newbranchname ...
I'm working on a project that has basically 2 branches: master and "next-version". The two are constantly changed and the next-version needs to have the latest changes from master, but I can't just merge them both, because one version is published and the other one is still on alpha. I currently merge master to next-version everytime a...
I'm using two local repositories/working trees for our project development: one for the release version (bug-fixes only) and one for the continuing development in the master. Hence I don't need to switch between branches back and forth. We only merge changes from the release branch to the master, but not the opposite. Is it possib...
I have moved an SVN repo to Git and probably due to a number of clonings, I'm now left with a bunch of branches that look like BranchA origin/BranchA remotes/BranchA remotes/origin/BranchA remotes/origin/origin/BranchA i.e. the same branch is listed a number of times. How can I clean this mess up. There are > 50 branches, some are not...
For my school projects, I was used to have one big repo with several subdirectories for the specific projects. Because I had no time, I always commited anything into the master branch. The problem is, that this turns out to be unpracticable, as it becomes more and more difficult to revert older commits or figuring out which commit belon...
Hi guys! I'm kinda new to git and now I'm in this situation: i have like four branches (master, b1,b2,b3) after i worked on b1-b3, i realized i have something to change on branch master that should be in all other branches i changed what i needed in master and... here is my problem: how do i update all other branches with master br...
First off, sorry if this is a duplicate, but I tried searching and all I could find was stuff on how to make branches in Git and whatnot. That's not what I'm looking for so much; I'm trying to figure out how different people out there setup their Git branches to match their workflow. Let me give you an example of how our company does i...
Hi, I installed a fresh instance of gitosis, and also have an old one. What do I have to do to move the repos from the old to the new server? Clone on the new server? What do I have to change on the developer computers, to switch the remote branch? Or do they need to clone again? ...
I have a project in SVN that I'm migrating to Git. The project consists of a "core" product (under trunk), which is then branched within the same repository and used as a starting point to customize for each individual client that we roll the product out to. It seems to me that these aren't real branches as they will never be merged ba...
Pretend I branched from my master branch to a topic branch, and then I did a few commits on my topic branch. Is there a command that tells me the commit hash on the master branch that my topic branch originated from? Ideally, I wouldn't have to know how many commits I've made ( trying to avoid HEAD^5 ). I've googled and SO'd around and...
Here's a common workflow hurdle I encounter often: master is our "stable" branch $ git status # On branch master nothing to commit (working directory clean) create a module on a branch $ git checkout -b foo $ echo "hello" > world $ git add . $ git commit -m "init commit for foo module" $ git checkout master $ git merge foo do work...
Long story short, I have a git repo with several branches, and I would like to move it to an SVN repo while maintaining all of the branches and commit history. So far I have not had much luck, most of the methods I have found do not migrate the branches as I would expect. (they are combined, or ignored, or eaten by a grue) I was plann...
My organisation is preparing to release an open-source version of our software using github, however I'm not sure the best way to approach this: We have two branches master and release, master contains some proprietary components that we have decided not to release, and release contains the cleaned-up version that we want to distribute....
I just deleted the wrong branch with some experimental changes I need with git branch -D branchName. How do I recover the branch? ...
From the man page: Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "remotes/<name>". So I removed a bunch of branches using git push origin :staleStuff and then ran git remote prune origin Howeve...