X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=9740736f6aef3266ae292bd790f27d52c4ca4402;hb=254e80ed9dc18935d3f0c9f7f2b70c307ff04194;hp=7b4c249bf575f8ee31f5b3a0bb19cdf9e4b5b579;hpb=539107f9827c73f83f5482e34ef52f201f22a22e;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 7b4c249..9740736 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -179,8 +179,11 @@
 	unstage = reset HEAD --
 
 	# Github: pull request, Gitlab: merge request
-	mr = "!f() { git fetch ${2:-origin} refs/merge-requests/$1/head:pr/$1 && git checkout pr/$1; }; f"
-	pr = "!f() { git fetch ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+	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]
@@ -198,6 +201,9 @@
 [include]
 	path = ~/lib/config/git/light_bg
 
+[init]
+	defaultBranch = master
+
 [log]
 	abbrevCommit = true
 	#mailmap = true