user/sven/git.git, branch v1.6.5.2

GIT 1.6.5.2

2009-10-26T01:37:56Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-fix-unpack-zlib-check' into maint

2009-10-26T01:35:59Z

* jc/maint-fix-unpack-zlib-check: Fix incorrect error check while reading deflated pack data

Merge branch 'maint-1.6.4' into maint

2009-10-25T22:34:41Z

* maint-1.6.4: ls-files: excludes should not impact tracked files

Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4

2009-10-25T22:34:27Z

* jk/maint-1.6.3-ls-files-no-ignore-cached: ls-files: excludes should not impact tracked files

Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint-1.6.4

2009-10-25T22:34:21Z

* jn/maint-1.6.3-check-ref-format-doc: Documentation: describe check-ref-format --branch

t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test

2009-10-25T00:21:24Z

GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano

Work around option parsing bug in the busybox tar implementation

2009-10-24T19:25:01Z

The first argument of the tar command is interpreted as a bundle of letters specifying the mode of operation and additional options, with any option arguments taken from subsequent words on the command line as needed. The implementation of tar in busybox treats this bundle as if preceded by a dash and then parses it by getopt rules, which mishandles 'tar xfo -'. Use 'tar xof -' instead to work this around. Signed-off-by: Andreas Schwab Signed-off-by: Junio C Hamano

Fix list of released versions in the toc document

2009-10-24T05:38:44Z

Merge branch 'jp/maint-send-email-fold' into maint

2009-10-24T05:30:42Z

* jp/maint-send-email-fold: git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s

Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint

2009-10-24T05:30:20Z

* jn/maint-1.6.3-check-ref-format-doc: Documentation: describe check-ref-format --branch