From: Rudolf Polzer Date: Fri, 22 Apr 2011 06:27:08 +0000 (+0200) Subject: ignore upstream merge commits X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f1caff063c235a10a9dadde3b8326ae3e1c263b;p=xonotic%2Fdiv0-gittools.git ignore upstream merge commits --- diff --git a/git-branch-manager b/git-branch-manager index 78a6d06..f03dde9 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', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix$branch"), undef) + for((split /\n/, check_defined "git-log: $!", backtick 'git', 'log', '--no-merges', '--topo-order', '--reverse', '--pretty=fuller', @datefilter, "$revprefix$branch"), undef) { if(defined $cur_commit and (not defined $_ or /^commit (\S+)/)) {