From 1a2c3b1029a51956e00a060561f47551dbbe0590 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 23 Jun 2014 12:48:44 +0200 Subject: [PATCH] [FIX] git config for pull --- odoo.py | 1 - 1 file changed, 1 deletion(-) diff --git a/odoo.py b/odoo.py index ba4178fbbcc..ad34f9ddc1a 100755 --- a/odoo.py +++ b/odoo.py @@ -72,7 +72,6 @@ def cmd_setup_git(): # alias run('git','config','alias.st','status') # merge bzr style - run('git','config','merge.ff','no') run('git','config','merge.commit','no') # pull let me choose between merge or rebase only works in git > 2.0, use an alias for 1 run('git','config','pull.ff','only')