![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Dec 2009 21:53:58 +0000 (13:53 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Dec 2009 21:53:58 +0000 (13:53 -0800) | ||
| commit | 957f5db74fcf2a00260c8bdef4bf147b1b990914 | |
| tree | 293baa7d48d5c9428b2ffc232519f875d4cd5770 | tree | snapshot |
| parent | af742b9b27c3e3caac9b304c76db323e2334b955 | commit | diff |
| parent | e1622bfcbad680225ad5c337e4778df88389227e | commit | diff |
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()
* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
| git-am.sh | diff1 | | diff2 | | blob | history |
| git-instaweb.sh | diff1 | | diff2 | | blob | history |
| git-rebase--interactive.sh | diff1 | | diff2 | | blob | history |