X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.gitconfig;h=90aab8ce9b0ddc445d82f8d3dbdaca1959665de3;hp=4ecffc961f05df80455355b514ce00f71b1e9c42;hb=e7cba5ec6fb24efc7c22343b964754cd5adeb90f;hpb=54bbf45016b36c34c560a2158ae51329d74805ea

diff --git a/.gitconfig b/.gitconfig
index 4ecffc9..90aab8c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -66,6 +66,10 @@
 
   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
@@ -102,9 +106,18 @@
   # 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
@@ -131,7 +144,7 @@
 	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