diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-05 09:20:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-05 09:27:25 -0800 |
| commit | 3c8f6c8c4f00414e66076c2c97c834d01f828491 (patch) | |
| tree | 983851e2396d04bfb3f640fe3ab07d8d8bfd2dd3 /builtin-merge-file.c | |
| parent | git-svn: persistent memoization (diff) | |
| download | tgif-3c8f6c8c4f00414e66076c2c97c834d01f828491.tar.xz | |
Revert 30816237 and 7e62265
It seems that we have bad interaction with the code related to
GIT_WORK_TREE and "grep --no-index", and broke running grep inside
the .git directory. For now, just revert it and resurrect it after
1.7.0 ships.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions