ant/workstation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Force ff-only for merge

Browse source
This commit is contained in:
Anthony Rose 2024-05-09 11:21:08 +01:00
parent dbeca13721
commit f9bba1b3ef
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/home-cli/files/gitconfig
View file

@ -4,6 +4,8 @@
[pull] [pull]
ff = only ff = only
rebase = false rebase = false
[merge]
ff = only
[push] [push]
default = simple default = simple
[color] [color]