Merge branch 'maint' to sync with GIT 1.6.0.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-19 19:32:29 -08:00
parent ec9f0ea3e6 718258e256
commit efe05b019c
26 changed files with 185 additions and 48 deletions
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@ -222,6 +222,9 @@ D-C-O.  Indeed you are encouraged to do so.  Do not forget to
 place an in-body "From: " line at the beginning to properly attribute
 the change to its true author (see (2) above).

+Also notice that a real name is used in the Signed-off-by: line. Please
+don't hide your real name.
+
 Some people also put extra tags at the end.

 "Acked-by:" says that the patch was reviewed by the person who