difftool--helper: Remove use of the GIT_MERGE_TOOL variable

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 6830e1627d67c59407885a3cfa44e83a802613bc..b121f4537ccb173d9f289734f1fe2e89b28d7562 100755 (executable)
--- 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