co = checkout
tags = tag -n1 -l
# Log helpers
- ll = log --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
+ ll = log --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
graph = log --all --graph --topo-order --pretty='format:%C(yellow)%h%Creset %s %C(black bold)(by %an)%Creset%C(green bold)%d%Creset%n'
# Remote helpers
- track = !git-track
- incoming = !git-incoming
in = !git-incoming
- outgoing = !git-outgoing
out = !git-outgoing
# Branch helpers
- bd = !git-brdate
+ bd = !git-branch-dates
bv = !git branch --color -vv
- cv = !git-cv
- subtree = !git-subtree
+ cv = !git-cherry-view
# Diff helpers
- df = diff --patience
- dfc = diff --patience --cached
+ df = diff
+ dfc = diff --cached
+ dfw = diff --word-diff=color
+ dfcw = diff --cached --word-diff=color
+ # Searching
+ ls = ls-files
+ ack = !git-ack
+ # Submodules
+ sub = !git-subup
+ sup = !git-subup pull
# Misc
root = rev-parse --show-toplevel
- sh = !git-sh
- thanks = !git-thanks
who = shortlog -s --
- sup = !git-subup
fp = format-patch --stdout
+ patch = !git --no-pager diff --no-color
[core]
filemode = true
[diff]
renames = copies
+ algorithm = patience
[sendemail]
smtpserver = smtp.gmail.com
remote = green
plain = red bold
+[color "decorate"]
+ branch = green bold
+ remoteBranch = green
+
[color "status"]
added = yellow
changed = green bold
untracked = blue bold
+[color "diff-highlight"]
+ oldNormal = red bold
+ oldHighlight = red bold 52
+ newNormal = green bold
+ newHighlight = green bold 22
+
[push]
default = matching