[FIX] git config for pull
This commit is contained in:
parent
fd21912cfe
commit
1a2c3b1029
1
odoo.py
1
odoo.py
|
@ -72,7 +72,6 @@ def cmd_setup_git():
|
||||||
# alias
|
# alias
|
||||||
run('git','config','alias.st','status')
|
run('git','config','alias.st','status')
|
||||||
# merge bzr style
|
# merge bzr style
|
||||||
run('git','config','merge.ff','no')
|
|
||||||
run('git','config','merge.commit','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
|
# 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')
|
run('git','config','pull.ff','only')
|
||||||
|
|
Loading…
Reference in New Issue