diff options
| author | dakkar <dakkar@thenautilus.net> | 2018-10-04 18:20:52 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2018-10-04 18:20:52 +0100 |
| commit | d6fd5a919e3402e097b9832b623b8ebed779b988 (patch) | |
| tree | 6dd5f08fcbe0696dd7655e84740069340bfe33ca | |
| parent | Merge remote-tracking branch 'origin/master' into nautilus (diff) | |
| download | dotfiles-d6fd5a919e3402e097b9832b623b8ebed779b988.tar.gz dotfiles-d6fd5a919e3402e097b9832b623b8ebed779b988.tar.bz2 dotfiles-d6fd5a919e3402e097b9832b623b8ebed779b988.zip | |
pull-rebase-preserve!
| -rw-r--r-- | .gitconfig | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -19,7 +19,7 @@ [push] default = tracking [pull] - rebase = true + rebase = preserve [diff] mnemonicprefix = true renames = copies |