diff options
| -rw-r--r-- | git/gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig index 7175704..a8a6365 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -11,3 +11,5 @@ rebase = false [init] templateDir = /home/blaise/.git-template +[branch] + autosetupmerge = true |