Mikaela/shell-things
1
0
Fork 0
mirror of https://gitea.blesmrt.net/mikaela/shell-things.git synced 2024-11-25 04:29:29 +01:00
Code Issues Projects Releases Wiki Activity

gitconfig: pull.ff only

Browse Source 
This fixes a warning on `git pulling` and retains consistent behaviour
across my other options that do ff unless there is letter n in the end
This commit is contained in:
Aminda Suomalainen 2020-06-13 22:12:12 +03:00
parent 8ea8012153
commit 3d21859967
Signed by: Mikaela
GPG Key ID: 99392F62BAE30723
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mikaela/gitconfig
View File

@ -54,3 +54,5 @@
program = gpgv2 program = gpgv2
[tag] [tag]
forceSignAnnotated = true forceSignAnnotated = true
[pull]
ff = only

8
conf/gitconfig
View File

@ -49,8 +49,10 @@
[interactive] [interactive]
# diffFilter = diff-highlight # diffFilter = diff-highlight
[gpg] [gpg]
program = gpg2 program = gpg2
[gpgv] [gpgv]
program = gpgv2 program = gpgv2
[tag] [tag]
forceSignAnnotated = true forceSignAnnotated = true
[pull]
ff = only