diff options
Diffstat (limited to 'gitconfig')
-rw-r--r-- | gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |