X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=9740736f6aef3266ae292bd790f27d52c4ca4402;hb=10ed04ab0d9665c425dc9878b46fd47d75b2d50a;hp=b91ec8dc967666d20dc7d07680cec2248486e713;hpb=9fdbdd036b61b679b478be3c84a71d1a532182ec;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index b91ec8d..9740736 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -178,7 +178,12 @@
 	sw = show --word-diff --decorate
 	unstage = reset HEAD --
 
-	pr = "!f() { git fetch ${2:-origin} 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 merge-requests; }; f"
+	merge-request = "!f() { git mpr $1 $2 merge-requests checkout; }; f"
+	fetch-pr = "!f() { git mpr $1 $2 pull; }; f"
+	pull-request = "!f() { git mpr $1 $2 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