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

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 11205f98f4a9904a7d320b94fee8d2523cbeeff7..e38baa0e704ab3c020dd017f1a57e768c5f791a4 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -68,7 +68,7 @@
 
   # See https://blog.filippo.io/git-fixup-amending-an-older-commit/
   # This is a slightly modified version
-  fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autosquash $TARGET~; }; f"
+  fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autostash --autosquash $TARGET~; }; f"
 
   ### remote ###
 
@@ -136,6 +136,8 @@
   unassume-all = "!git assumed | xargs git update-index --no-assume-unchanged"
   assumed  = !"git ls-files -v | grep ^h | cut -c 3-"
 
+  stashes = stash list
+
        branches = branch --all
        ca = commit --all
        cv = commit --verbose
@@ -150,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
@@ -161,7 +163,7 @@
        lr1 = log --decorate --reverse --oneline
        lr5 = log --decorate --reverse -5
        null-merge = merge --strategy=ours
-       rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+       rbi123 = "!f() { exec git rebase --interactive --autostash $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
        rbi = !exec git rbi123 '' ''
        rbia = !exec git rbi123 --autosquash ''
        rbiap = !exec git rbi123 --autosquash --preserve-merges
@@ -176,6 +178,14 @@
        sw = show --word-diff --decorate
        unstage = reset HEAD --
 
+       # 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]
        autosetuprebase = always
 
@@ -191,6 +201,9 @@
 [include]
        path = ~/lib/config/git/light_bg
 
+[init]
+       defaultBranch = master
+
 [log]
        abbrevCommit = true
        #mailmap = true
@@ -217,6 +230,11 @@
 #[tag]
 #      sort = version:refname
 
+[tar "tar.bz2"]
+       command = bzip2 -c
+[tar "tar.xz"]
+       command = xz -c
+
 #[transfer]
 #      fsckObjects = true
 
@@ -233,16 +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:"
-       pushInsteadOf = "github:"
-       pushInsteadOf = "git://github.com/"
-[url "git://github.com/"]
-       insteadOf = "github:"
-[url "git@gist.github.com:"]
-       insteadOf = "gst:"
-       pushInsteadOf = "gist:"
-       pushInsteadOf = "git://gist.github.com/"
-[url "git://gist.github.com/"]
-       insteadOf = "gist:"
+# 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/