.gitconfig mergetool and autoSetupRemote
dblume commited on 2022-10-13 20:30:01
Showing 1 changed files, with 3 additions and 0 deletions.
- .gitconfig 21c4385..79eeb14
| ... | ... |
@@ -9,6 +9,7 @@ |
| 9 | 9 |
prompt = false |
| 10 | 10 |
[push] |
| 11 | 11 |
default = simple |
| 12 |
+ autoSetupRemote = true |
|
| 12 | 13 |
[core] |
| 13 | 14 |
editor = vim |
| 14 | 15 |
excludesfile = ~/.gitignore |
| ... | ... |
@@ -22,5 +23,7 @@ |
| 22 | 23 |
defaultBranch = main |
| 23 | 24 |
[fetch] |
| 24 | 25 |
prune = true |
| 26 |
+[merge] |
|
| 27 |
+ tool = vimdiff |
|
| 25 | 28 |
[include] |
| 26 | 29 |
path = ~/.gitconfig.local |
| 27 | 30 |