Because I get quite often asked about my git config I will post it here and leave some notes.
[core] whitespace = cr-at-eol pager = diff-so-fancy | less --tabs=4 -RFX excludesfile = ~/.gitignore [user] name = Morris Jobke email = ... signingkey = FE03C3A163FEDE68 [alias] lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit cu = "!git branch --merged | grep -v '\\*' | grep -v master | xargs -n 1 git branch -d" recent = branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\" [color] ui = true branch = auto diff = auto interactive = auto status = auto pager = true ui = true [push] default = simple [color "status"] added = green changed = yellow untracked = red [color "branch"] current = green reverse local = green remote = red [commit] gpgsign = true [receive] fsckObjects = true [gpg] program = gpg [pull] ff = only
core section there is one config to use Carriage return for all line endings, the
diff-so-fancy diff highlighter (see brew install section) and a global ignore list for git.
user section holds the information that all my commits should contain.
I have two aliases -
git lg gives a nice and simple overview of the git history:
The second alias -
git cu - cleans up the git repository from branches that are fully merged in the current branch. Usually you call this on your master and stable branches to cleanup merged feature or backport branches.
The third alias -
git recent - shows the local branches sorted by commit date. (Thx to Aaron Patterson)
The default colors in git are quite boring so I use basically green (staged), yellow (changed) and red (untracked) as indicator for different sections in the git status and git branch outputs.
The remaining sections are just for push behaviour and that commits should be signed by default.