Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=402ffa742ca8d76eca8eb24719ed39e9b464932e
commit 402ffa742ca8d76eca8eb24719ed39e9b464932e
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Tue Feb 12 11:56:59 2008 +0100
dg: git rebase -> git pull --rebase
diff --git a/darcs-git.py b/darcs-git.py
index 967f139..97aed19 100755
--- a/darcs-git.py
+++ b/darcs-git.py
@@ -656,8 +656,7 @@ Options:
return(1)
else:
changes = False
- # TODO: use git pull --rebase after 1.5.4, in fact we just pulling
without a merge
- if os.system("git rebase %s" % options.gitopts) != 0:
+ if os.system("git pull --rebase %s" % options.gitopts) != 0:
return(1)
if changes and os.system("git stash apply --index && sed -i '$d' `git rev-parse
--show-cdup`.git/logs/refs/stash") != 0:
return(1)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
