| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Sep 2009 08:30:53 +0000 (01:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Sep 2009 08:30:53 +0000 (01:30 -0700) |
* maint:
GIT 1.6.4.3
svn: properly escape arguments for authors-prog
http.c: remove verification of remote packs
grep: accept relative paths outside current working directory
grep: fix exit status if external_grep() punts
Conflicts:
GIT-VERSION-GEN
RelNotes
GIT 1.6.4.3
svn: properly escape arguments for authors-prog
http.c: remove verification of remote packs
grep: accept relative paths outside current working directory
grep: fix exit status if external_grep() punts
Conflicts:
GIT-VERSION-GEN
RelNotes
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-grep.c | patch | | diff1 | | diff2 | | blob | history |
| git-svn.perl | patch | | diff1 | | diff2 | | blob | history |
| grep.h | patch | | diff1 | | diff2 | | blob | history |
| http.c | patch | | diff1 | | diff2 | | blob | history |
| t/t7002-grep.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-grep.c
Simple merge
diff --cc git-svn.perl
Simple merge
diff --cc grep.h
Simple merge
diff --cc http.c
Simple merge
diff --cc t/t7002-grep.sh
Simple merge