diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-25 22:45:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-25 22:45:07 +0300 |
commit | ad7ace714d353ef49045bc37c1363e8fc904792d (patch) | |
tree | 7cefc4953bac3061de09d5380719f12c6e4fcef3 /git-rebase.sh | |
parent | b073b7a990deb1cb3425db45642fa18c8b3cb65c (diff) | |
parent | e1622bfcbad680225ad5c337e4778df88389227e (diff) |
Merge branch 'rs/work-around-grep-opt-insanity'
* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
Conflicts:
git-instaweb.sh
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 6830e1627d..b121f4537c 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 |