properly ignore merges in upstream rebase detection
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 10:40:57 +0000 (12:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 10:40:57 +0000 (12:40 +0200)
all

diff --git a/all b/all
index df63f12ce74f9d2c7e3228e16354732e7f8013ac..c1da7075411b58ce3ade3f895d4d8d00e8076adf 100755 (executable)
--- a/all
+++ b/all
@@ -194,8 +194,8 @@ fix_upstream_rebase()
        # no merge-base? upstream did filter-branch
        if [ -n "$r_base" ]; then
                # otherwise, check if the two histories are "similar"
-               r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merged" | sort -u`
-               r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merged" | sort -u`
+               r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merge" | sort -u`
+               r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merge" | sort -u`
 
                # heuristics: upstream rebase/filter-branch if more than 50% of the commits of one of the sides are in the other too
                r_lc_me=`echo "$r_l_me" | wc -l`