Merge branch 'jc/checkout-merge-base'

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 9bd89746ab6ab6999aeead41a59ca0f4c9b3a61a..3de0942c0fa604fd0aed8561e3f2727c0a7887e5 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -489,7 +489,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
@@ -518,7 +518,7 @@ then
 fi
 
 # If the $onto is a proper descendant of the tip of the branch, then
-# we just fast forwarded.
+# we just fast-forwarded.
 if test "$mb" = "$branch"
 then
        say "Fast-forwarded $branch_name to $onto_name."