X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=odoo.py;h=ad34f9ddc1ac1ed1c7a49120dac466a5d8c96d78;hb=f8706c31e0551ad5185973c52333aaed603412d0;hp=cafd13c3a6cd61ad1774bead989a0d6015ee6e0d;hpb=1f7a2eaf3050d82f53fd27aa724cfc32f246f33a;p=odoo%2Fodoo.git

diff --git a/odoo.py b/odoo.py
index cafd13c..ad34f9d 100755
--- a/odoo.py
+++ b/odoo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #----------------------------------------------------------
 # odoo cli
 #
@@ -58,7 +58,7 @@ def git_locate():
         path = None
     return path
 
-def cmd_setup_git_init():
+def cmd_setup_git():
     git_dir = git_locate()
     if git_dir:
         printf('git repo found at %s',git_dir)
@@ -67,12 +67,15 @@ def cmd_setup_git_init():
         os.chdir('odoo')
         git_dir = os.getcwd()
     if git_dir:
-        # sane push config for git < 2.0
+        # push sane config for git < 2.0, and hooks
         run('git','config','push.default','simple')
+        # alias
+        run('git','config','alias.st','status')
         # merge bzr style
-        run('git','config','merge.ff','no')
         run('git','config','merge.commit','no')
-        # push hooks
+        # 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','alias.pl','pull --ff-only')
         pre_push_path = os.path.join(git_dir, '.git/hooks/pre-push')
         open(pre_push_path,'w').write(GIT_HOOKS_PRE_PUSH.strip())
         os.chmod(pre_push_path, 0755)
@@ -137,7 +140,7 @@ def cmd_setup_pg():
             setup_pg_debian(git_dir)
 
 def cmd_setup():
-    cmd_setup_git_init()
+    cmd_setup_git()
     cmd_setup_deps()
     cmd_setup_pg()