[user] name = Sylvain Herlédan email = sylvain.herledan@hrafnagud.info [alias] co = checkout cp = cherry-pick qlog = log --pretty=oneline --abbrev-commit --graph --decorate unstage = reset HEAD headless = "!sh -c 'if [ $# = 1 ]; then git symbolic-ref HEAD refs/heads/$1 && rm .git/index; else echo \"usage: git headless \" >&2 && exit 1; fi' -" origin = remote show origin wdiff = diff --color-words wshow = show --color-words lc = log ORIG_HEAD.. --stat --no-merges k = !gitk commit-submodules = "!subs=$(git ls-files --error-unmatch --stage -- $(git ls-files --modified) | grep ^160000 | cut -f2-); msg=$(echo Submodule updates: $subs; echo; git submodule summary); git commit -e -m \"$msg\" --only $(echo $subs)" mkpatch = diff-tree -p --pretty pushable = push -n origin "refs/heads/*:refs/heads/*" unmerged = ls-files --unmerged whatup = log --stat origin..@{0} lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit lgns = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --name-status [color] branch = true diff = true pager = true status = true [sendemail] smtpserver = /usr/bin/msmtp [push] default = current [merge] tool = vimdiff3 log = true [status] showUntrackedFiles = no [mergetool "vimdiff3"] cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" [format] headers = "Content-Type: text/plain; charset=\"utf-8\"" [core] editor = vim