Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Sep 2009 08:30:53 +0000 (01:30 -0700)
committerJunio 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

1  2 
builtin-grep.c
git-svn.perl
grep.h
http.c
t/t7002-grep.sh

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