GitConfiguration.sh

# Identity
git config --global user.name "Max Mustermann"
git config --global user.email "[email protected]"
git config --global user.signingkey 12345678

# Line break handling
# See https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration
git config --global core.autocrlf input

# KDiff3 as diff and merge tool
git config --global merge.tool kdiff3
git config --global mergetool.kdiff3.trustexitcode false
git config --global diff.guitool kdiff3
git config --global diff.tool kdiff3
git config --global difftool.kdiff3.trustexitcode false
# ...for Windows
git config --global mergetool.kdiff3.path C:/Programme/KDiff3/kdiff3.exe
git config --global difftool.kdiff3.path C:/Programme/KDiff3/kdiff3.exe
# ...for Ubuntu
git config --global mergetool.kdiff3.path /usr/bin/kdiff3
git config --global difftool.kdiff3.path /usr/bin/kdiff3
# ...for Mac
git config --global mergetool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3
git config --global difftool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3

# P4Merge as diff and merge tool
git config --global merge.tool p4merge
git config --global mergetool.p4merge.trustexitcode false
git config --global diff.guitool p4merge
git config --global diff.tool p4merge
git config --global difftool.p4merge.trustexitcode false
# ...for Windows
git config --global mergetool.p4merge.path C:/Programme/p4merge/p4merge.exe
git config --global difftool.p4merge.path C:/Programme/p4merge/p4merge.exe
# ...for Ubuntu
git config --global mergetool.p4merge.path /usr/bin/p4merge
git config --global difftool.p4merge.path /usr/bin/p4merge
# ...for Mac
git config --global mergetool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge
git config --global difftool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge

# By default rebase instead of merging when pulling
git config --global pull.rebase true

# Usefull aliases
git config --global alias.lga "log --graph --decorate --oneline --color --all"
git config --global alias.lg "log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr %an)%Creset' --abbrev-commit --date=relative"
git config --global alias.bl "branch --list -vv"
git config --global alias.ba "branch --all --list -vv"
git config --global alias.bd "branch -d"
git config --global alias.co "checkout"
git config --global alias.cm "commit -m"
git config --global alias.cl "config --global --list"
git config --global alias.dc "diff --cached"
git config --global alias.fe "fetch --all --tags --prune --progress"
git config --global alias.rv "remote -v"
git config --global alias.st "status"