Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=cf01380556969eee66b792bcac71d2696e8fdb1a
commit cf01380556969eee66b792bcac71d2696e8fdb1a
Author: VMiklos <[EMAIL PROTECTED]>
Date: Wed Sep 19 21:27:31 2007 +0200
dg: use git rebase instead of git merge when pulling
less 'merge' commits should make everyone happy
diff --git a/darcs-git.py b/darcs-git.py
index fc10721..91d91f4 100755
--- a/darcs-git.py
+++ b/darcs-git.py
@@ -604,6 +604,8 @@ Options:
optind += 1
if optind < len(argv):
options.gitopts = " ".join(argv[optind:])
+ else:
+ options.gitopts = "origin"
if options.help:
usage(0)
os.system("git fetch")
@@ -622,7 +624,7 @@ Options:
if ret in ("n", "q"):
sys.exit(0)
print "Invalid response, try again!"
- os.system("git pull %s" % options.gitopts)
+ os.system("git rebase %s" % options.gitopts)
def get(argv):
def usage(ret):
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
