Merge branch 'rs/work-around-grep-opt-insanity'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Nov 2009 19:45:07 +0000 (11:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Nov 2009 19:45:07 +0000 (11:45 -0800)
commitad7ace714d353ef49045bc37c1363e8fc904792d
tree7cefc4953bac3061de09d5380719f12c6e4fcef3
parentb073b7a990deb1cb3425db45642fa18c8b3cb65c
parente1622bfcbad680225ad5c337e4778df88389227e
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
git-am.sh
git-bisect.sh
git-filter-branch.sh
git-instaweb.sh
git-mergetool--lib.sh
git-rebase--interactive.sh
git-rebase.sh
git-sh-setup.sh
git-submodule.sh