Git configuration for alias commands, branch management, syntax coloring, merge strategies, and more.
Get these files:
git clone https://github.com/SixArm/sixarm_git_gitconfig.git
Copy these files wherever you want to keep them, such as:
mkdir ~/.gitconfig.d
cp sixarm_git_gitconfig/gitconfig.d/* ~/.gitconfig.d/
Edit your ~/.gitconfig file to include any of the files you want to use:
[include]
path = ~/.gitconfig.d/alias.txt
path = ~/.gitconfig.d/alias-for-cvs.txt
path = ~/.gitconfig.d/alias-for-gitk.txt
path = ~/.gitconfig.d/alias-for-rails.txt
path = ~/.gitconfig.d/alias-for-svn.txt
path = ~/.gitconfig.d/apply.txt
path = ~/.gitconfig.d/branch.txt
path = ~/.gitconfig.d/color.txt
path = ~/.gitconfig.d/core.txt
path = ~/.gitconfig.d/diff.txt
path = ~/.gitconfig.d/github.txt
path = ~/.gitconfig.d/merge.txt
path = ~/.gitconfig.d/mergetool.txt
path = ~/.gitconfig.d/push.txt
path = ~/.gitconfig.d/rerere.txt
path = ~/.gitconfig.d/user.txt
If you use the user.txt file, you will want to personalize it:
[user]
email = alice@example.com
name = Alice Anderson
If you use GitHub and the github.txt file, you will want to personalize it:
[github]
user = alice
token = alice-token
You can customize any of the file items by editing the file as you like.
You can also customize any of the file items by adding your own item later in your own gitconfig file.
For example you can include our aliases then customize "git l" with your own definition:
[include]
path = ~/.gitconfig.d/alias.txt
[alias]
l = log --graph --oneline
To use better pretty formatting:
[format]
pretty = "%H %ci %ce %ae %d %s"
If you like terse status messages:
[alias]
s = status -sb
If you like log summaries:
[alias]
l = log --graph --oneline
We like using the meld mergetool because it is powerful and can use three windows for comparisons.
This repo includes a script for running meld with three windows.
To use meld with three windows, put the script on your path, for example:
cp bin/meld-with-three-windows /usr/local/bin
If you prefer using most as a pager:
[core]
pager = most
To get most, do brew install most on OSX, or apt-get install most on Ubuntu, etc.
We tell git-branch and git-checkout to setup new branches so that git-pull will appropriately merge from that remote branch.
git config --global branch.autosetupmerge true
If we didn't do this, we would have to add --track to our branch command or manually merge remote tracking branches with "fetch" and then "merge".
To install git tab completion, we go to the git soure code directory then run:
echo "source ./contrib/completion/git-completion.bash" >> /etc/bash.bashrc
Read http://git.or.cz/gitwiki/InterfacesFrontendsAndTools
Our favorite open source free GUI for Ubuntu is http://cola.tuxfamily.org/
For more git config ideas, and for credit for many of the aliases here, please see these excelent resources:
- https://git.wiki.kernel.org/index.php/Aliases
- http://stackoverflow.com/questions/267761/what-does-your-gitconfig-contain
- http://superuser.com/questions/169695/what-are-your-favorite-git-aliases
- http://stackoverflow.com/questions/1309430/how-to-embed-bash-script-directly-inside-a-git-alias
- http://code.joejag.com/2013/everyday-git-aliases/
- http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/
- https://ochronus.com/git-tips-from-the-trenches/
- http://mislav.uniqpath.com/2010/07/git-tips/
- https://ochronus.com/git-tips-from-the-trenches/
- http://mislav.uniqpath.com/2010/07/git-tips/