Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=a68f665d54b03cebe499ba0ba5a6ad8e5dd2f4f3
commit a68f665d54b03cebe499ba0ba5a6ad8e5dd2f4f3
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Apr 9 15:52:25 2008 +0200
dg: no longer use --no-merges: we now merge only when it's really necessary
- so there is no more 'merge span' to hide them automatically
diff --git a/darcs-git.py b/darcs-git.py
index 1c4d375..5ccca17 100755
--- a/darcs-git.py
+++ b/darcs-git.py
@@ -574,7 +574,7 @@ Options:
if options.help:
usage(0)
branch = get_branch()
- sock = os.popen("git log %s/%s..%s --no-merges 2>&1" %
(options.gitopts, branch, branch))
+ sock = os.popen("git log %s/%s..%s 2>&1" % (options.gitopts, branch,
branch))
lines = sock.readlines()
ret = sock.close()
if not len(lines):
@@ -635,7 +635,7 @@ Options:
usage(0)
os.system("git fetch %s" % options.gitopts)
branch = get_branch()
- sock = os.popen("git log %s..%s/%s --no-merges 2>&1" % (branch,
options.gitopts, branch))
+ sock = os.popen("git log %s..%s/%s 2>&1" % (branch, options.gitopts,
branch))
lines = sock.readlines()
ret = sock.close()
if not len(lines):
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
