X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=38ab1e492bc9cfb81889e53233366ee4cfbb0d67;hb=bb9a11f5000c2fbad0f24f04fc15f782637eb669;hp=969d6d788343d6cb110a8855cc936e6e881f565b;hpb=812a006437cc082befed76db46a1ed71202fe953;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 969d6d7..38ab1e4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -152,7 +152,7 @@
 	file = cat-file -t
 	type = cat-file -t
 	ff = merge --ff-only
-	git = !exec git
+	#git = !exec git
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -178,7 +178,12 @@
 	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"
+	# Github: pull request, Gitlab: merge request
+	mpr = "!f() { git fetch ${2:-origin} refs/$3/$1/head:pr/$1 && if [ \"$4\" = checkout ]; then git checkout pr/$1; fi; }; f"
+	fetch-mr = "!f() { git mpr $1 ${2:-origin} merge-requests; }; f"
+	merge-request = "!f() { git mpr $1 ${2:-origin} merge-requests checkout; }; f"
+	fetch-pr = "!f() { git mpr $1 ${2:-origin} pull; }; f"
+	pull-request = "!f() { git mpr $1 ${2:-origin} pull checkout; }; 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]
@@ -196,6 +201,9 @@
 [include]
 	path = ~/lib/config/git/light_bg
 
+[init]
+	defaultBranch = master
+
 [log]
 	abbrevCommit = true
 	#mailmap = true
@@ -222,6 +230,11 @@
 #[tag]
 #	sort = version:refname
 
+[tar "tar.bz2"]
+	command = bzip2 -c
+[tar "tar.xz"]
+	command = xz -c
+
 #[transfer]
 #	fsckObjects = true
 
@@ -241,13 +254,9 @@
 # Github URL shortcuts
 [url "git@github.com:"]
 	insteadOf = "gh:"
-	pushInsteadOf = "github:"
-	pushInsteadOf = "git://github.com/"
-[url "git://github.com/"]
 	insteadOf = "github:"
+	insteadOf = "git://github.com/"
 [url "git@gist.github.com:"]
 	insteadOf = "gst:"
-	pushInsteadOf = "gist:"
-	pushInsteadOf = "git://gist.github.com/"
-[url "git://gist.github.com/"]
 	insteadOf = "gist:"
+	insteadOf = "git://gist.github.com/"