X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.gitconfig;h=9740736f6aef3266ae292bd790f27d52c4ca4402;hp=9e3e776bd021a4cb8f02e55c5f0b5d00a7773d6e;hb=f08975628aad267b22545b05b182f0b79918d441;hpb=b11c3b167cefe888135d7fdb4430253d117b5716

diff --git a/.gitconfig b/.gitconfig
index 9e3e776..9740736 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:-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