odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] git config for pull

This commit is contained in:
Antony Lesuisse 2014-06-23 12:48:44 +02:00
parent fd21912cfe
commit 1a2c3b1029
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
odoo.py
View File

@ -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')