X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=b121f4537ccb173d9f289734f1fe2e89b28d7562;hb=9c8398f0c9d1fc92df5c1a7a52c810294d8ac3f8;hp=6830e1627d67c59407885a3cfa44e83a802613bc;hpb=6d975c24a96d607061dbcf354a50dc8410ed4b55;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 6830e1627..b121f4537 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -467,7 +467,7 @@ orig_head=$branch mb=$(git merge-base "$onto" "$branch") if test "$upstream" = "$onto" && test "$mb" = "$onto" && # linear history? - ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null + ! (git rev-list --parents "$onto".."$branch" | sane_grep " .* ") > /dev/null then if test -z "$force_rebase" then