From 4f1caff063c235a10a9dadde3b8326ae3e1c263b Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 22 Apr 2011 08:27:08 +0200 Subject: [PATCH] ignore upstream merge commits --- git-branch-manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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+)/)) { -- 2.39.2