diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2022-10-03 01:43:06 +0200 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2022-10-03 01:43:06 +0200 |
| commit | ac4ec38f44387963862a40db6b9fe212f10c0f82 (patch) | |
| tree | bb3c8fd82515b876813eb53c7f3ac61e649baa9e | |
| parent | 476cc883bcb0e1c0097187e05fdc8571598efaa0 (diff) | |
git: enable autostashing for merges
| -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 |