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

diff --git a/.gitconfig b/.gitconfig
index 478bd4a..8b2f479 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -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
@@ -175,6 +178,9 @@
 	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