### commit ###
- ci = commit --interactive
-
cm = commit --message
### checkout ###
rbs = rebase --skip
+ # See https://blog.filippo.io/git-fixup-amending-an-older-commit/
+ # This is a slightly modified version
+ fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autostash --autosquash $TARGET~; }; f"
+
### remote ###
rs = remote show
rp = remote prune
+ incoming = !git remote update --prune; exec git log ..@{upstream}
+ outgoing = log @{upstream}..
+
+ # Push to all remotes
+ push-to-all-remotes = !git remote | xargs -I% -n1 git push %
+
### show-branch ###
# show-branch - print a list of branches and their commits.
ssb = status --short --branch
- aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"
+ aliases = "!git config --get-regexp '^alias\\.' | cut -c7- | sed 's/ / = /'"
+
+ 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"
+ add-global-alias = "!exec git add-alias --global"
+ add-local-alias = "!exec git add-alias --local"
- tags = tag -n1 -l
+ # Last tag in the current branch
+ lasttag = describe --tags --abbrev=0
+
+ # Latest annotated tag in all branches
+ lasttagged = !exec git describe --tags `exec git rev-list --tags --max-count=1`
+
+ # List all tags
+ tags = tag --list -n1
# Find text in any commit ever
grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f"
+ # Edit all files of the given type
+ edit-cached = !"f() { git ls-files --cached | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+ edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+ edit-others = !"f() { git ls-files --others | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+ edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+ edit-killed = !"f() { git ls-files --killed | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+ edit-modified = !"f() { git ls-files --modified | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+ edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; exec `exec git var GIT_EDITOR` `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`"
+ edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; exec `exec git var GIT_EDITOR` `f`"
+ add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; exec 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/[ ]/ = /'
+ assume = update-index --assume-unchanged
+ unassume = update-index --no-assume-unchanged
+ # assume-all = "!git st -s | awk {'print $2'} | xargs git assume"
+ unassume-all = "!git assumed | xargs git update-index --no-assume-unchanged"
+ assumed = !"git ls-files -v | grep ^h | cut -c 3-"
+
+ stashes = stash list
+
branches = branch --all
ca = commit --all
cv = commit --verbose
cav = commit --all --verbose
cane = commit --amend --no-edit
checkin = commit
+ ci = commit
cat = cat-file -p
+ dh = "!f() { git -c color.diff=always diff \"$@\" | perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less; }; f"
+ dir = rev-parse --git-dir
dump = cat-file -p
file = cat-file -t
type = cat-file -t
- incoming = !git remote update --prune; git log ..@{upstream}
+ ff = merge --ff-only
+ #git = !exec git
l1 = log --decorate --oneline
l5 = log --decorate -5
ld = log --decorate
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 %
- rbi123 = "!f() { git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
- rbi = !git rbi123 '' ''
- rbia = !git rbi123 --autosquash ''
- rbiap = !git rbi123 --autosquash --preserve-merges
- rbip = !git rbi123 '' --preserve-merges
- remotes = remote -v
- #root = !pwd
+ rbi123 = "!f() { exec git rebase --interactive --autostash $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+ rbi = !exec git rbi123 '' ''
+ rbia = !exec git rbi123 --autosquash ''
+ rbiap = !exec git rbi123 --autosquash --preserve-merges
+ rbip = !exec git rbi123 '' --preserve-merges
+ remotes = remote --verbose
+ #root = !exec pwd
root = rev-parse --show-toplevel
+ status = status --no-short
st = status --short
stb = status --short --branch
sd = show --decorate
sw = show --word-diff --decorate
unstage = reset HEAD --
+ pr = "!f() { git fetch ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+ clean-pr = "!git checkout master ; git for-each-ref refs/heads/pr/* --format=\"%(refname)\" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
+
[branch]
autosetuprebase = always
[color]
ui = auto
+[diff]
+ indentHeuristic = true
+
+[grep]
+ fallbackToNoIndex = true
+
[include]
path = ~/lib/config/git/light_bg
[log]
abbrevCommit = true
+ #mailmap = true
[merge]
tool = vimdiff
[push]
default = simple
+ followTags = true
+ recurseSubmodules = check
[receive]
- denyNonFastForwards = true
+ #denyCurrentBranch = updateInstead
+ denyDeleteCurrent = true
+ #denyDeletes = true
+ #denyNonFastForwards = true
+
+#[tag]
+# sort = version:refname
+
+#[transfer]
+# fsckObjects = true
+
+[user]
+ signingKey = 6E080B70B6287B03
[web]
browser = webbrowser
[gui]
fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
+
+# Github URL shortcuts
+[url "git@github.com:"]
+ insteadOf = "gh:"
+ insteadOf = "github:"
+ insteadOf = "git://github.com/"
+[url "git@gist.github.com:"]
+ insteadOf = "gst:"
+ insteadOf = "gist:"
+ insteadOf = "git://gist.github.com/"