diff options
Diffstat (limited to 'base/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 |