diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2020-06-23 10:09:01 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2020-06-23 10:09:01 +0100 |
| commit | 4912f8abda4ea22e3156c1e8fbed8f2025d60e6c (patch) | |
| tree | 5ceac06ddabde1eb94a915679cbf7c254940aa85 /git | |
| parent | 62558f19608e2bf2db031df4460925e9557de223 (diff) | |
| parent | 5e5aa0b9f9b0b19472af001ea07d1c49b230dac6 (diff) | |
Merge branch 'master' of github.com:urbainvaes/dotfiles
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 0e7df50..738c719 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -19,3 +19,5 @@ default = simple [merge] ff = true +[pull] + rebase = false |