X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=8b2f47915e05fc1843e6e248ded629be72f48c41;hb=32770092f5921b28003aed3cf4f40e893415f989;hp=c7383fe3550dba5522157ae3f2139c94f40afa15;hpb=835a73ad2a97584e09bbf8d2a4fad903de28862c;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index c7383fe..8b2f479 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,9 +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 = !exec git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -165,23 +171,34 @@
 	remotes = remote --verbose
 	#root = !exec pwd
 	root = rev-parse --show-toplevel
+	status = status --no-short
 	st = status --short
 	stb = status --short --branch
 	sd = show --decorate
 	sw = show --word-diff --decorate
 	unstage = reset HEAD --
 
+	pr = "!f() { git fetch ${2:-upstream} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+	clean-pr = "!git checkout master ; git for-each-ref refs/heads/pr/* --format=\"%(refname)\" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
+
 [branch]
 	autosetuprebase = always
 
 [color]
 	ui = auto
 
+[diff]
+	indentHeuristic = true
+
+[grep]
+	fallbackToNoIndex = true
+
 [include]
 	path = ~/lib/config/git/light_bg
 
 [log]
 	abbrevCommit = true
+	#mailmap = true
 
 [merge]
 	tool = vimdiff
@@ -193,9 +210,23 @@
 
 [push]
 	default = simple
+	followTags = true
+	recurseSubmodules = check
 
 [receive]
-	denyNonFastForwards = true
+	#denyCurrentBranch = updateInstead
+	denyDeleteCurrent = true
+	#denyDeletes = true
+	#denyNonFastForwards = true
+
+#[tag]
+#	sort = version:refname
+
+#[transfer]
+#	fsckObjects = true
+
+[user]
+	signingKey = 6E080B70B6287B03
 
 [web]
 	browser = webbrowser