projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd21912
)
[FIX] git config for pull
author
Antony Lesuisse
<al@openerp.com>
Mon, 23 Jun 2014 10:48:44 +0000
(12:48 +0200)
committer
Antony Lesuisse
<al@openerp.com>
Mon, 23 Jun 2014 10:50:57 +0000
(12:50 +0200)
odoo.py
patch
|
blob
|
history
diff --git
a/odoo.py
b/odoo.py
index
ba4178f
..
ad34f9d
100755
(executable)
--- 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')