opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

git: Reject non-ff merges

Browse source
This commit is contained in:
Oliver Davies 2020-04-29 11:30:20 +01:00
parent d134275ecf
commit 7838681ef7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tag-git/gitconfig
View file

@ -99,6 +99,9 @@
[include] [include]
path = ~/.gitconfig.local path = ~/.gitconfig.local
[merge]
ff = only
[rebase] [rebase]
autosquash = true autosquash = true
autostash = true autostash = true
@ -117,10 +120,6 @@
ff = only ff = only
rebase = true rebase = true
[merge]
defaultToUpstream = true
ff = false
[filter "lfs"] [filter "lfs"]
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true