GIT 1.5.5.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc Documentation/RelNotes-1.5.5.6.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d5e85cb70ebe385caee5b3cd908cc0cd9345165f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes-1.5.5.6.txt
@@@ -1,0 -1,0 +1,10 @@@
++GIT v1.5.5.6 Release Notes
++==========================
++
++Fixes since 1.5.5.5
++-------------------
++
++ * Removed support for an obsolete gitweb request URI, whose
++   implementation ran "git diff" Porcelain, instead of using plumbing,
++   which would have run an external diff command specified in the
++   repository configuration as the gitweb user.

diff --cc RelNotes
index 61a6d5cf29195c3fb753cfa36a19f4eff76fc825,8fbe7db0e2a61ae4952f611b02d5a61bbcaf2b77..d94e74259b6dcd8b4645425b6381b050d24646af
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes-1.5.5.5.txt
 -Documentation/RelNotes-1.5.4.7.txt
++Documentation/RelNotes-1.5.5.6.txt

diff --cc gitweb/gitweb.perl
Simple merge