Merge branch 'rs/work-around-grep-opt-insanity' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:53:58 +0000 (13:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:53:58 +0000 (13:53 -0800)
commit957f5db74fcf2a00260c8bdef4bf147b1b990914
tree293baa7d48d5c9428b2ffc232519f875d4cd5770
parentaf742b9b27c3e3caac9b304c76db323e2334b955
parente1622bfcbad680225ad5c337e4778df88389227e
Merge branch 'rs/work-around-grep-opt-insanity' into maint

* rs/work-around-grep-opt-insanity:
  Protect scripted Porcelains from GREP_OPTIONS insanity
  mergetool--lib: simplify guess_merge_tool()
git-am.sh
git-instaweb.sh
git-rebase--interactive.sh