diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:24:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:24:20 -0700 |
| commit | 45c58ba00a9c4e31e94997b59fd8112f962fa222 (patch) | |
| tree | 74f2d92d9560adb88aa065c1003522e4a39388bb /Documentation/git-merge-tree.txt | |
| parent | http.c: remove verification of remote packs (diff) | |
| parent | grep: accept relative paths outside current working directory (diff) | |
| download | tgif-45c58ba00a9c4e31e94997b59fd8112f962fa222.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions