[git] default ff on pull
1 files changed, 2 insertions(+), 0 deletions(-)

M rc/gitconfig
M rc/gitconfig +2 -0
@@ 15,3 15,5 @@ 
 	algorithm = patience
 [log]
 	date = iso-local
+[pull]
+	ff = only