.gitconfig: Refactor merge/pull-request aliases

diff --git a/.gitconfig b/.gitconfig
index f03671a01d6c391fef24313993b08e6972caf356..9740736f6aef3266ae292bd790f27d52c4ca4402 100644 (file)
--- 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]