adam/cshenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A few merge options for git.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2024-06-17 12:38:39 -04:00
parent 0a97d0b8ff
commit 7c8a3ac56d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git/gitconfig
View File

@ -34,6 +34,11 @@
mergetool = vimdiff mergetool = vimdiff
tool = vimdiff tool = vimdiff
# Merge commit setup
log = 50
branchdesc = true
suppressDest=
[push] [push]
default = upstream default = upstream