diff options
Diffstat (limited to 'git/gitconfig')
| -rw-r--r-- | git/gitconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig index 97d9b5e..b33252e 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -43,3 +43,6 @@ [column] branch = auto + +[merge] + autoStash = true |