Here are a couple git command aliases I’ve added to my .gitconfig file which may be generally useful. If you combine with Git auto-complete, these will be included as well.
- find-merge / show-merge – used to help trace problematic merges / conflicts (credit: Stack overflow thread on tracing merges)
- pull-all – pulls and fast-forwards all local branches that can be fast-forwarded. Keeps me from accidentally making a local commit over some remote change.
- tags-recent – by default git tag –list lists ALL tags in chronological order, which is pretty painful; this shows you only the most recent 10.
To make these available, add the following block to the .gitconfig file in your home directory.