aboutsummaryrefslogtreecommitdiffhomepage
path: root/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 1700dfb..a006560 100644
--- a/gitconfig
+++ b/gitconfig
@@ -20,6 +20,7 @@
20 git stash show -p | git apply -R && \ 20 git stash show -p | git apply -R && \
21 git stash drop stash@{1} 21 git stash drop stash@{1}
22 swapprotocol = !swap-protocol.bash 22 swapprotocol = !swap-protocol.bash
23 mergethis = "!f() { git commit-tree HEAD: -p $1 -p HEAD -m \"Merge branch $(git branch --show-current)\" | xargs git branch --force $1; }; f"
23 24
24[merge] 25[merge]
25 tool = vimdiff 26 tool = vimdiff