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
50 # diff - show changes not yet staged
53 # diff - changes about to be commited
56 # diff - show changes but by word, not line
65 rbc = rebase --continue
77 incoming = !git remote update --prune; git log ..@{upstream}
78 outgoing = log @{upstream}..
81 push-to-all-remotes = !git remote | xargs -I% -n1 git push %
85 # show-branch - print a list of branches and their commits.
92 ssb = status --short --branch
94 aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"
96 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"
97 add-global-alias = "!git add-alias --global"
98 add-local-alias = "!git add-alias --local"
100 tags = tag -n1 --list
102 # Find text in any commit ever
103 grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f"
105 # Editing and adding conflicted files: when we get many merge conflicts
106 # and want to quickly solve them using an editor, then add the files.
107 edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; "${VISUAL:-${EDITOR:-vi}}" `f`"
108 add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
110 # Get the current branch name
111 branch-name = rev-parse --abbrev-ref HEAD
113 branches = branch --all
115 cv = commit --verbose
116 cav = commit --all --verbose
117 cane = commit --amend --no-edit
124 l1 = log --decorate --oneline
125 l5 = log --decorate -5
127 lg = log --decorate --graph
128 lg1 = log --decorate --graph --oneline
129 lg5 = log --decorate --graph -5
130 lr = log --decorate --reverse
131 lr1 = log --decorate --reverse --oneline
132 lr5 = log --decorate --reverse -5
133 null-merge = merge --strategy=ours
134 rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
135 rbi = !git rbi123 '' ''
136 rbia = !git rbi123 --autosquash ''
137 rbiap = !git rbi123 --autosquash --preserve-merges
138 rbip = !git rbi123 '' --preserve-merges
139 remotes = remote --verbose
141 root = rev-parse --show-toplevel
143 stb = status --short --branch
145 sw = show --word-diff --decorate
146 unstage = reset HEAD --
149 autosetuprebase = always
155 path = ~/lib/config/git/light_bg
163 #[mergetool "vimdiff3"]
164 # Don't forget to add -f for gvim
166 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
172 denyNonFastForwards = true
177 [browser "webbrowser"]
181 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
182 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0