X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=61b2d1398b9c4dc148eb3c396aea658cc30c5025;hb=b6d98d86be0c8cecf208beb0379ad1459aa13c60;hp=a5dd9706d03a62d005ce9909e998b0677aa7e4aa;hpb=50b9dfa17f24b869e9b1df2a982d5cbf8353423e;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index a5dd970..61b2d13 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 exec git rebase --interactive --autosquash $TARGET~; }; f"
+
   ### remote ###
 
   rs = remote show
@@ -74,7 +78,7 @@
 
   rp = remote prune
 
-  incoming = !git remote update --prune; git log ..@{upstream}
+  incoming = !git remote update --prune; exec git log ..@{upstream}
   outgoing = log @{upstream}..
 
   # Push to all remotes
@@ -91,30 +95,37 @@
 
   ssb = status --short --branch
 
-  aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"
+  aliases = "!git config --get-regexp '^alias\\.' | colrm 1 6 | 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 = "!git add-alias --global"
-  add-local-alias = "!git add-alias --local"
+  add-global-alias = "!exec git add-alias --global"
+  add-local-alias = "!exec git add-alias --local"
+
+  # Last tag in the current branch
+  lasttag = describe --tags --abbrev=0
+
+  # Latest annotated tag in all branches
+  lasttagged = !git describe --tags `git rev-list --tags --max-count=1`
 
-  tags = tag -n1 --list
+  # 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 ; }; \"${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`"
+  edit-cached = !"f() { git ls-files --cached | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-others = !"f() { git ls-files --others | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-killed = !"f() { git ls-files --killed | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-modified = !"f() { git ls-files --modified | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; 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 ; }; "${VISUAL:-${EDITOR:-vi}}" `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 `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
@@ -141,12 +152,12 @@
 	lr5 = log --decorate --reverse -5
 	null-merge = merge --strategy=ours
 	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
+	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 = !pwd
+	#root = !exec pwd
 	root = rev-parse --show-toplevel
 	st = status --short
 	stb = status --short --branch