Here is a command that gives you all tracking branches (configured for ‘pull’), see: $ git branch -vv main aaf02f0 [main/master: ahead 25] Some other commit * master add0a03 [jdsumsion/master] Some commit You have to wade through the SHA and any long-wrapping commit messages, but it’s quick to type and I get the tracking branches … Read more
You can review the differences with a: git log HEAD..origin/master before pulling it (fetch + merge) (see also “How do you get git to always pull from a specific branch?”) When you have a message like: “Your branch and ‘origin/master’ have diverged, # and have 1 and 1 different commit(s) each, respectively.” , check if … Read more
To remove all dangling commits (including those still reachable from stashes and other reflogs) do this: git reflog expire –expire-unreachable=now –all git gc –prune=now But be certain that this is what you want. I recommend you read the man pages but here is the gist: git gc removes unreachable objects (commits, trees, blobs (files)). An … Read more
Option 5, a custom merge driver, is probably the way to get closest to what you want. It is surprisingly easy to do. Below is an example of one that I think should get you pretty close to the behavior you desire. First, create a merge driver script called merge-and-verify-driver. Make it executable and put … Read more
Use the –sort=-committerdate option of git for-each-ref; Also available since Git 2.7.0 for git branch: Basic Usage: git for-each-ref –sort=-committerdate refs/heads/ # Or using git branch (since version 2.7.0) git branch –sort=-committerdate # DESC git branch –sort=committerdate # ASC Result: Advanced Usage: git for-each-ref –sort=committerdate refs/heads/ –format=”%(HEAD) %(color:yellow)%(refname:short)%(color:reset) – %(color:red)%(objectname:short)%(color:reset) – %(contents:subject) – %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))” … Read more
Git This answer includes GitHub as many folks have asked about that too. Local repositories Git (locally) has a directory (.git) which you commit your files to and this is your ‘local repository’. This is different from systems like SVN where you add and commit to the remote repository immediately. Git stores each version of … Read more
The ProGit book has a very good explanation: Tracking Branches Checking out a local branch from a remote branch automatically creates what is called a tracking branch. Tracking branches are local branches that have a direct relationship to a remote branch. If you’re on a tracking branch and type git push, Git automatically knows which … Read more
Edited answer with now (in the second half of this entry) the new Git1.7 fixup! action and –autosquash option for quick commit reordering and message editing. First, the classic squashing process, as done before Git1.7. (Git1.7 has the same process, only made faster by the possibility of automatic commit reordering as opposed to manual reordering, … Read more
Hmm, not sure I agree with Nick re tag being similar to a branch. A tag is just a marker Trunk would be the main body of development, originating from the start of the project until the present. Branch will be a copy of code derived from a certain point in the trunk that is … Read more
UPDATE: You can add other branches to exclude like master and dev if your workflow has those as a possible ancestor. Usually I branch off of a “sprint-start” tag and master, dev and qa are not ancestors. First, list locally-tracking branches that were merged in remote (you may consider to use -r flag to list … Read more