aboutsummaryrefslogtreecommitdiffhomepage
path: root/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/gitconfig b/gitconfig
index b641f77..1700dfb 100644
--- a/gitconfig
+++ b/gitconfig
@@ -21,10 +21,6 @@
21 git stash drop stash@{1} 21 git stash drop stash@{1}
22 swapprotocol = !swap-protocol.bash 22 swapprotocol = !swap-protocol.bash
23 23
24[core]
25 editor = vim
26 pager =
27
28[merge] 24[merge]
29 tool = vimdiff 25 tool = vimdiff
30 26