rebase -i: squash should retain the authorship of the _first_ commit

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index b9baa1d3b4685859d6ad3530a64865cc054df7a3..61635bf04dc8aac5ec491f16c9c9b796457679c0 100644 (file)
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -31,7 +31,8 @@ Checklist (and a short version for the impatient):
          corrupt whitespaces.
        - provide additional information (which is unsuitable for
          the commit message) between the "---" and the diffstat
-       - send the patch to the list _and_ the maintainer
+       - send the patch to the list (git@vger.kernel.org) and the
+         maintainer (gitster@pobox.com).
        - if you change, add, or remove a command line option or
          make some other user interface change, the associated
          documentation should be updated as well.
@@ -296,15 +297,15 @@ diff --git a/pico/pico.c b/pico/pico.c
 --- a/pico/pico.c
 +++ b/pico/pico.c
 @@ -219,7 +219,9 @@ PICO *pm;
-           switch(pico_all_done){      /* prepare for/handle final events */
-             case COMP_EXIT :          /* already confirmed */
-               packheader();
+           switch(pico_all_done){      /* prepare for/handle final events */
+             case COMP_EXIT :          /* already confirmed */
+               packheader();
 +#if 0
-               stripwhitespace();
+               stripwhitespace();
 +#endif
-               c |= COMP_EXIT;
-               break;
- 
+               c |= COMP_EXIT;
+               break;
+
 
 (Daniel Barkalow)