jdkaplan/dotfiles
1
0
Fork 0
Code Activity

git: only allow fast-forward merges

Browse source
This commit is contained in:
Jeremy Kaplan 2019-08-29 16:52:46 -07:00
commit a7f4525fdf
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
git/config
View file

@ -3,8 +3,16 @@
email = jdkaplan@metagram.net email = jdkaplan@metagram.net
[color] [color]
ui = true ui = true
[diff]
wsErrorHighlight = all
[merge]
conflictStyle = diff3
ff = only
[pull]
ff = only
[push] [push]
default = simple default = simple
[alias] [alias]
ap = add -p ap = add -p
b = branch b = branch
@ -33,7 +41,3 @@
[includeIf "gitdir:~/projects/"] [includeIf "gitdir:~/projects/"]
path = config-personal path = config-personal
[merge]
conflictStyle = diff3
[diff]
wsErrorHighlight = all