diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2017-05-29 04:51:46 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2017-05-29 04:51:46 +0300 |
| commit | d4fc6528408881ea03d177ca0f9df3060833bee9 (patch) | |
| tree | 927727b78a15df7f6c40b702bf172b0a595cddb0 /%HOME% | |
| parent | .gitconfig: add alias.ll, alias.lll (diff) | |
| download | linux-home-d4fc6528408881ea03d177ca0f9df3060833bee9.tar.gz linux-home-d4fc6528408881ea03d177ca0f9df3060833bee9.zip | |
.gitconfig: mergetool.keepBackup = false w/ KDiff3
Diffstat (limited to '%HOME%')
| -rw-r--r-- | %HOME%/.gitconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig index 24c13cc..d68efc8 100644 --- a/%HOME%/.gitconfig +++ b/%HOME%/.gitconfig @@ -9,14 +9,12 @@ [merge] tool = kdiff3 [mergetool "kdiff3"] - trustExitCode = false -[mergetool] keepBackup = false + trustExitCode = false [diff] tool = kdiff3 -[difftool] - keepBackup = false [difftool "kdiff3"] + keepBackup = false trustExitCode = false [pull] ff = only |