# HG changeset patch
# User nanaya <me@nanaya.pro>
# Date 1593414384 -32400
# Node ID e852829c3f762b6270a35088798b985e94384c04
# Parent  c548e83e4c57acdd247c2ab981682125d211f19b
[git] default ff on pull

diff -r c548e83e4c57 -r e852829c3f76 rc/gitconfig
--- a/rc/gitconfig	Mon Jun 08 15:07:48 2020 +0900
+++ b/rc/gitconfig	Mon Jun 29 16:06:24 2020 +0900
@@ -15,3 +15,5 @@
 	algorithm = patience
 [log]
 	date = iso-local
+[pull]
+	ff = only