Merge branch 'cb/maint-1.6.3-grep-relative-up' into next
commitf9b5b48003f09d054295793e8a8a616e4e6081aa
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2009 00:21:19 +0000 (7 17:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2009 00:21:19 +0000 (7 17:21 -0700)
tree3b33280f9e452643dbc9d498878d7c4d9173434d
parentcc2317328781439d684ba9138b6c6b849d99d0d4
parent493b7a08d80535def6756b281873e4e0937ba6c2
Merge branch 'cb/maint-1.6.3-grep-relative-up' into next

* 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