Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint
commit45c58ba00a9c4e31e94997b59fd8112f962fa222
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Sep 2009 08:24:20 +0000 (13 01:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Sep 2009 08:24:20 +0000 (13 01:24 -0700)
tree74f2d92d9560adb88aa065c1003522e4a39388bb
parent59b8d38f6e4f19b93c5dc4493ab11706acd101b5
parent493b7a08d80535def6756b281873e4e0937ba6c2
Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint

* cb/maint-1.6.3-grep-relative-up:
  grep: accept relative paths outside current working directory
  grep: fix exit status if external_grep() punts

Conflicts:
t/t7002-grep.sh
builtin-grep.c
grep.h
t/t7002-grep.sh