.vimrc: Restore `WrapForTmux`

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 11205f98f4a9904a7d320b94fee8d2523cbeeff7..9e3e776bd021a4cb8f02e55c5f0b5d00a7773d6e 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
@@ -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,9 @@
        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"
+       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
 
@@ -236,13 +241,9 @@
 # Github URL shortcuts
 [url "git@github.com:"]
        insteadOf = "gh:"
-       pushInsteadOf = "github:"
-       pushInsteadOf = "git://github.com/"
-[url "git://github.com/"]
        insteadOf = "github:"
+       insteadOf = "git://github.com/"
 [url "git@gist.github.com:"]
        insteadOf = "gst:"
-       pushInsteadOf = "gist:"
-       pushInsteadOf = "git://gist.github.com/"
-[url "git://gist.github.com/"]
        insteadOf = "gist:"
+       insteadOf = "git://gist.github.com/"