X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=8c2f04054602eeaf5879f5b76feb30e0198a8537;hb=43f1c1115d4bf42ce69852a9514dc351264524fd;hp=fadf841ad54e7490ca76f1b86f7f81fbc499e241;hpb=c62f4a398bfa5262b1fc8fa46ef88285933f79f8;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index fadf841..8c2f040 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -105,7 +105,7 @@
   lasttag = describe --tags --abbrev=0
 
   # Latest annotated tag in all branches
-  lasttagged = !git describe --tags `git rev-list --tags --max-count=1`
+  lasttagged = !exec git describe --tags `exec git rev-list --tags --max-count=1`
 
   # List all tags
   tags = tag --list -n1
@@ -114,17 +114,17 @@
   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 `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`"
+  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 ; }; exec `git var GIT_EDITOR` `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
@@ -136,6 +136,8 @@
   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
@@ -144,12 +146,13 @@
 	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
 	ff = merge --ff-only
-	git = !git
+	git = !exec git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -211,11 +214,17 @@
 	#denyCurrentBranch = updateInstead
 	denyDeleteCurrent = true
 	#denyDeletes = true
-	denyNonFastForwards = true
+	#denyNonFastForwards = true
+
+#[tag]
+#	sort = version:refname
 
 #[transfer]
 #	fsckObjects = true
 
+[user]
+	signingKey = 6E080B70B6287B03
+
 [web]
 	browser = webbrowser