### 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 git rebase --interactive --autosquash $TARGET~; }; f"
+
### remote ###
rs = remote show
rp = remote prune
+ incoming = !git remote update --prune; 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.
aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"
- tags = tag -n1 -l
+ 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 = "!git add-alias --global"
+ add-local-alias = "!git add-alias --local"
+
+ tags = tag -n1 --list
# 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 ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
+ edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
+ edit-others = !"f() { git ls-files --others | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
+ edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
+ edit-killed = !"f() { git ls-files --killed | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
+ edit-modified = !"f() { git ls-files --modified | sort -u ; }; \"${VISUAL:-${EDITOR:-vi}}\" `f`"
+ edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; "${VISUAL:-${EDITOR:-vi}}" `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`"
+ edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; "${VISUAL:-${EDITOR:-vi}}" `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 --all
+ ca = commit --all
+ cv = commit --verbose
+ cav = commit --all --verbose
+ cane = commit --amend --no-edit
+ checkin = commit
+ ci = commit
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
+ ld = log --decorate
lg = log --decorate --graph
lg1 = log --decorate --graph --oneline
lg5 = log --decorate --graph -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 = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
+ rbi123 = "!f() { exec 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 --verbose
#root = !pwd
root = rev-parse --show-toplevel
st = status --short
stb = status --short --branch
- tags = tag --list
+ sd = show --decorate
+ sw = show --word-diff --decorate
unstage = reset HEAD --
- wdiff = diff --word-diff
- wshow = show --word-diff --decorate
[branch]
autosetuprebase = always