diff options
| author | Adam Hovorka <[email protected]> | 2020-06-12 15:39:40 -0600 |
|---|---|---|
| committer | Adam Hovorka <[email protected]> | 2020-06-12 15:39:40 -0600 |
| commit | 502622f2a2cfe77ffc29ca7fb4629a9bab233ee4 (patch) | |
| tree | 54f2e816814790eb6187562c99cd71e568a0c752 | |
| parent | c7193cdb2eea10c6c6e106185bf076ba43f07718 (diff) | |
Add pull mode to gitconfig
| -rw-r--r-- | base/gitconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/gitconfig b/base/gitconfig index 56fcb65..3db3b5a 100644 --- a/base/gitconfig +++ b/base/gitconfig @@ -24,7 +24,8 @@ tool = vimdiff [push] default = simple -#[pull] +[pull] + rebase = false # ff = only #[rerere] # enabled = 1 |