From e75e5417890b00add887762e96e1b62db40edec3 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 30 Apr 2011 00:19:55 +0200 Subject: [PATCH] Revert "ignore upstream merge commits" This reverts commit 4f1caff063c235a10a9dadde3b8326ae3e1c263b. --- git-branch-manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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+)/)) { -- 2.39.2