git, branch v1.7.4-rc2

Git 1.7.4-rc2

2011-01-13T20:14:18Z

Signed-off-by: Junio C Hamano

Merge branch 'jn/gitweb-no-logo'

2011-01-13T19:39:18Z

* jn/gitweb-no-logo: gitweb: make logo optional

Merge branch 'jn/perl-funcname'

2011-01-13T19:38:05Z

* jn/perl-funcname: userdiff/perl: catch BEGIN/END/... and POD as headers diff: funcname and word patterns for perl

Merge branch 'sr/gitweb-hilite-more'

2011-01-13T19:36:12Z

* sr/gitweb-hilite-more: gitweb: remove unnecessary test when closing file descriptor gitweb: add extensions to highlight feature map

Merge branch 'rj/svn-test'

2011-01-13T19:36:05Z

* rj/svn-test: lib-git-svn.sh: Move web-server handling code into separate function

Merge branch 'rj/test-fixes'

2011-01-13T19:35:28Z

* rj/test-fixes: t4135-*.sh: Skip the "backslash" tests on cygwin t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW t3032-*.sh: Pass the -b (--binary) option to sed on cygwin t6038-*.sh: Pass the -b (--binary) option to sed on cygwin Conflicts: t/t3032-merge-recursive-options.sh

Merge branch 'jk/diff-driver-binary-doc'

2011-01-13T19:34:56Z

* jk/diff-driver-binary-doc: docs: explain diff.*.binary option

Merge branch 'jn/t9010-work-around-broken-svnadmin'

2011-01-13T19:34:52Z

* jn/t9010-work-around-broken-svnadmin: t9010: svnadmin can fail even if available

Merge branch 'tr/submodule-relative-scp-url'

2011-01-13T19:34:39Z

* tr/submodule-relative-scp-url: submodule: fix relative url parsing for scp-style origin

RelNotes/1.7.4: minor fixes

2011-01-13T19:32:39Z

Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano