aboutsummaryrefslogtreecommitdiffstats
path: root/_gitconfig
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2022-01-07 20:56:50 +0800
committerAaron LI <aly@aaronly.me>2023-06-13 10:01:03 +0800
commit359b03bc4e1711e4dc2bf17aacd3bd15d6aec00c (patch)
treeac9dbc6a390aa84e20fb5dad4a1f470ce1c0b456 /_gitconfig
parent11dde7c6be488b2a49c29b89f8f890666e6b4fe3 (diff)
downloaddotfiles-359b03bc4e1711e4dc2bf17aacd3bd15d6aec00c.tar.bz2
git: Specify ff=only for pull to suppress warning
Diffstat (limited to '_gitconfig')
-rw-r--r--_gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/_gitconfig b/_gitconfig
index 5168cdc..33465f2 100644
--- a/_gitconfig
+++ b/_gitconfig
@@ -27,6 +27,9 @@
[push]
default = simple
+[pull]
+ ff = only
+
[commit]
template = ~/.gitmessage