From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 29 Apr 2011 22:19:55 +0000 (+0200)
Subject: Revert "ignore upstream merge commits"
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e75e5417890b00add887762e96e1b62db40edec3;p=xonotic%2Fdiv0-gittools.git

Revert "ignore upstream merge commits"

This reverts commit 4f1caff063c235a10a9dadde3b8326ae3e1c263b.
---

diff --git a/git-branch-manager b/git-branch-manager
index f03dde9..78a6d06 100755
--- a/git-branch-manager
+++ b/git-branch-manager
@@ -391,7 +391,7 @@ sub parse_log()
 	}
 	$cur_commit = $cur_msg = undef;
 	my @commits = ();
-	for((split /\n/, check_defined "git-log: $!", backtick 'git', 'log', '--no-merges', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix$branch"), undef)
+	for((split /\n/, check_defined "git-log: $!", backtick 'git', 'log', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix$branch"), undef)
 	{
 		if(defined $cur_commit and (not defined $_ or /^commit (\S+)/))
 		{