vim: simplify; zsh: remove simplify emptytrash; gitconfig: add pull

2020-06-08 12:10:32 +02:00
parent c6e960f08f
commit 9dcf1075de
3 changed files with 7 additions and 84 deletions
--- a/3
+++ b/3
@@ -77,6 +77,9 @@
 [merge]
    log = true

+[pull]
+    rebase = false
+
 [push]
    default = simple