### 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
add-global-alias = "!git add-alias --global"
add-local-alias = "!git add-alias --local"
- tags = tag -n1 -l
+ 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 ; }; `git var GIT_EDITOR` `f`"
+ edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; `git var GIT_EDITOR` `f`"
+ edit-others = !"f() { git ls-files --others | sort -u ; }; `git var GIT_EDITOR` `f`"
+ edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; `git var GIT_EDITOR` `f`"
+ edit-killed = !"f() { git ls-files --killed | sort -u ; }; `git var GIT_EDITOR` `f`"
+ edit-modified = !"f() { git ls-files --modified | sort -u ; }; `git var GIT_EDITOR` `f`"
+ edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; `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`"
+ edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; `git var GIT_EDITOR` `f`"
add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
# Get the current branch name
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
lr1 = log --decorate --reverse --oneline
lr5 = log --decorate --reverse -5
null-merge = merge --strategy=ours
- rbi123 = "!f() { git rebase --interactive $1 $2 ${3:-\"@{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 -v
+ remotes = remote --verbose
#root = !pwd
root = rev-parse --show-toplevel
st = status --short