2 # I copied some aliases from http://gitalias.com/ and other sources.
3 # Some I've added to gitalias. Some are mine.
5 # One letter alias for our most frequent commands.
30 be = branch --edit-description
34 bnm = branch --no-merged
38 ci = commit --interactive
52 # diff - show changes not yet staged
55 # diff - changes about to be commited
58 # diff - show changes but by word, not line
67 rbc = rebase --continue
79 incoming = !git remote update --prune; git log ..@{upstream}
80 outgoing = log @{upstream}..
83 push-to-all-remotes = !git remote | xargs -I% -n1 git push %
87 # show-branch - print a list of branches and their commits.
94 ssb = status --short --branch
96 aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"
98 add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git add-(local|global)-alias <new alias> <original command>\" >&2 && return 1; }; f"
99 add-global-alias = "!git add-alias --global"
100 add-local-alias = "!git add-alias --local"
102 tags = tag -n1 --list
104 # Find text in any commit ever
105 grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f"
107 # Editing and adding conflicted files: when we get many merge conflicts
108 # and want to quickly solve them using an editor, then add the files.
109 edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`"
110 add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
112 # Get the current branch name
113 branch-name = rev-parse --abbrev-ref HEAD
115 branches = branch --all
117 cv = commit --verbose
118 cav = commit --all --verbose
119 cane = commit --amend --no-edit
125 l1 = log --decorate --oneline
126 l5 = log --decorate -5
128 lg = log --decorate --graph
129 lg1 = log --decorate --graph --oneline
130 lg5 = log --decorate --graph -5
131 lr = log --decorate --reverse
132 lr1 = log --decorate --reverse --oneline
133 lr5 = log --decorate --reverse -5
134 null-merge = merge --strategy=ours
135 rbi123 = "!f() { git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
136 rbi = !git rbi123 '' ''
137 rbia = !git rbi123 --autosquash ''
138 rbiap = !git rbi123 --autosquash --preserve-merges
139 rbip = !git rbi123 '' --preserve-merges
140 remotes = remote --verbose
142 root = rev-parse --show-toplevel
144 stb = status --short --branch
146 sw = show --word-diff --decorate
147 unstage = reset HEAD --
150 autosetuprebase = always
156 path = ~/lib/config/git/light_bg
164 #[mergetool "vimdiff3"]
165 # Don't forget to add -f for gvim
167 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
173 denyNonFastForwards = true
178 [browser "webbrowser"]
182 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
183 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0