[user] name = Manoj Srivastava email = srivasta@debian.org [diff] renames = copies renamelimit = 200 [color] ui = auto interactive = auto [branch] autosetupmerge = true [pager] status = true show-branch = true [format] numbered = true [alias] diffstat = diff --stat -r lc = log ORIG_HEAD.. --stat --no-merges last = log -1 HEAD fetch-all = !git remote | xargs -n 1 git fetch prune-all = !git remote | xargs -n 1 git remote prune gitkconflict = !gitk --left-right HEAD...MERGE_HEAD edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; emacsclient -c `f`" add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`" co = checkout ci = commit -s st = status br = branch df = diff slg = "!git log --pretty='format:%Cblue%h %Cred%ar %Cblue%an %Creset -- %s'" lg = log -p llog = log --date=local k = !gitk amend = commit --amend up = pull --rebase who = shortlog -s -- whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -" whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short ignored = "!git ls-files --others --exclude-standard" staged = diff --cached changes = "!sh -c 'git status | sed -n \"/Untracked/N;//N;1,//d;s/^#/?/p\"; git diff --name-status -r \"$@\"' -" both = diff HEAD pending = !git --no-pager log --stat origin/master..master && echo wu = log --stat origin..@{0} undo = reset --hard unstage = reset HEAD -- track = !sh -c 'git branch --track "$0" "$1" && git checkout "$0"' graphviz = "!f() { echo 'digraph git {' ; git log --pretty='format: %h -> { %p }' \"$@\" | sed 's/[0-9a-f][0-9a-f]*/\"&\"/g' ; echo '}'; }; f" alias = !sh -c '[ -n \"$1\" -a -z \"$2\" ] && git config --global alias.\"$0\" \"$1\" && exit 0 || echo \"usage: git alias \" >&2 && exit 1'