Feat(recode-filenames-recursive): Allow to omit parameters

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index b91ec8dc967666d20dc7d07680cec2248486e713..e38baa0e704ab3c020dd017f1a57e768c5f791a4 100644 (file)
--- 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:-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
 
@@ -238,12 +251,37 @@
        fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
        fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
 
-# Github URL shortcuts
-[url "git@github.com:"]
-       insteadOf = "gh:"
-       insteadOf = "github:"
-       insteadOf = "git://github.com/"
-[url "git@gist.github.com:"]
-       insteadOf = "gst:"
-       insteadOf = "gist:"
-       insteadOf = "git://gist.github.com/"
+# git:// protocol fixers
+#[url "https://github.com/"]
+#      insteadOf = "git://github.com/"
+#[url "https://gist.github.com/"]
+#      insteadOf = "git://gist.github.com/"
+#[url "ssh://git@github.com/"]
+#      insteadOf = "git://github.com/"
+#[url "ssh://git@gist.github.com/"]
+#      insteadOf = "git://gist.github.com/"
+#[url "https://gitlab.com/"]
+#      insteadOf = "git://gitlab.com/"
+#[url "https://gist.gitlab.com/"]
+#      insteadOf = "git://gist.gitlab.com/"
+#[url "ssh://git@gitlab.com/"]
+#      insteadOf = "git://gitlab.com/"
+#[url "ssh://git@gist.gitlab.com/"]
+#      insteadOf = "git://gist.gitlab.com/"
+
+# Protocol changers
+#[url "https://github.com/"]
+#      insteadOf = ssh://github.com/
+#      insteadOf = ssh://git@github.com/
+#      insteadOf = git@github.com:
+
+#[url "ssh://git@github.com/"]
+#      insteadOf = https://github.com/
+
+#[url "https://gitlab.com/"]
+#      insteadOf = ssh://gitlab.com/
+#      insteadOf = ssh://git@gitlab.com/
+#      insteadOf = git@gitlab.com:
+
+#[url "ssh://git@gitlab.com/"]
+#      insteadOf = https://gitlab.com/