[alias]
+# I copied some aliases from http://gitalias.com/ and other sources.
+# Some I've added to gitalias. Some are mine.
+
+ # One letter alias for our most frequent commands.
+ a = add
+ b = branch
+ c = commit
+ d = diff
+ f = fetch
+ g = grep
+ l = log
+ m = merge
+ o = checkout
+ p = pull
+ r = remote
+ s = status
+ w = whatchanged
+
+ ### add ###
+
+ aa = add --all
+
+ ap = add --patch
+
+ au = add --update
+
+ ### branch ###
+
+ be = branch --edit-description
+
+ bm = branch --merged
+
+ bnm = branch --no-merged
+
+ ### commit ###
+
+ ci = commit --interactive
+
+ cm = commit --message
+
+ ### checkout ###
+
+ co = checkout
+
+ ### cherry-pick ###
+
+ chp = cherry-pick
+
+ ### diff ###
+
+ # diff - show changes not yet staged
+ dc = diff --cached
+
+ # diff - changes about to be commited
+ ds = diff --staged
+
+ # diff - show changes but by word, not line
+ dw = diff --word-diff
+
+ ### rebase ###
+
+ rb = rebase
+
+ rba = rebase --abort
+
+ rbc = rebase --continue
+
+ rbs = rebase --skip
+
+ ### remote ###
+
+ rs = remote show
+
+ ru = remote update
+
+ rp = remote prune
+
+ ### show-branch ###
+
+ # show-branch - print a list of branches and their commits.
+ sb = show-branch
+
+ ### status ###
+
+ ss = status --short
+
+ ssb = status --short --branch
+
+ aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"
+
+ tags = tag -n1 -l
+
+ # Find text in any commit ever
+ grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f"
+
+ # Editing and adding conflicted files: when we get many merge conflicts
+ # and want to quickly solve them using an editor, then add the files.
+ edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`"
+ add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
+
+ # Get the current branch name
+ branch-name = rev-parse --abbrev-ref HEAD
+
+ add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git [local-]alias <new alias> <original command>\" >&2 && return 1; }; f"
+ alias = "!git add-alias --global"
+ alias-local = "!git add-alias --local"
+ local-alias = "!git add-alias --local"
+ aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
b = branch
- branches = branch -a
- camend = commit --amend -C HEAD
+ branches = branch --all
+ cat = cat-file -p
+ dump = cat-file -p
+ file = cat-file -t
+ type = cat-file -t
+ camend = commit --amend --no-edit
checkin = commit
ci = commit
co = checkout
d = diff
dc = diff --cached
dshow = show --decorate
+ incoming = !git remote update --prune; git log ..@{upstream}
l = log --decorate
l1 = log --decorate --oneline
l5 = log --decorate -5
lr1 = log --decorate --reverse --oneline
lr5 = log --decorate --reverse -5
null-merge = merge --strategy=ours
+ outgoing = log @{upstream}..
+ push2all = !git remote | xargs -I% -n1 git push %
remotes = remote -v
- ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}' -"
+ ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
#root = !pwd
root = rev-parse --show-toplevel
st = status --short
stb = status --short --branch
- tags = tag -l
+ tags = tag --list
unstage = reset HEAD --
wdiff = diff --word-diff
wshow = show --word-diff --decorate
# 3 way diffs
# cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
+[push]
+ default = simple
+
[receive]
denyNonFastForwards = true