On Fri, Oct 31, 2008 at 11:57:12AM +0100, Pierre Habouzit wrote: > This allows to review every patch (and fix various aspects of them, or > comment them) in an editor just before being sent. Combined to the fact > that git send-email can now process revision lists, this makes git > send-email and efficient way to review and send patches interactively. > > Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx> > --- > Documentation/git-send-email.txt | 11 +++++++++++ > git-send-email.perl | 26 ++++++++++++++++++++++++-- > 2 files changed, 35 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt > index cafff1a..9ee81d5 100644 > --- a/Documentation/git-send-email.txt > +++ b/Documentation/git-send-email.txt > @@ -37,6 +37,11 @@ The --bcc option must be repeated for each user you want on the bcc list. > + > The --cc option must be repeated for each user you want on the cc list. > > +--annotate:: > + Review each patch you're about to send in an editor. The setting > + 'sendemail.multiedit' defines if this will spawn one editor per patch > + or one for all of them at once. > + > --compose:: > Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an > introductory message for the patch series. > @@ -204,6 +209,12 @@ sendemail.aliasfiletype:: > Format of the file(s) specified in sendemail.aliasesfile. Must be > one of 'mutt', 'mailrc', 'pine', or 'gnus'. > > +sendemail.multiedit:: > + If true (default), a single editor instance will be spawned to edit > + files you have to edit (patches when '--annotate' is used, and the > + summary when '--compose' is used). If false, files will be edited one > + after the other, spawning a new editor each time. > + > > Author > ------ > diff --git a/git-send-email.perl b/git-send-email.perl > index 0d50ee2..65c254d 100755 > --- a/git-send-email.perl > +++ b/git-send-email.perl > @@ -48,6 +48,7 @@ git send-email [options] <file | directory | rev-list > > --bcc <str> * Email Bcc: > --subject <str> * Email "Subject:" > --in-reply-to <str> * Email "In-Reply-To:" > + --annotate * Review each patch that will be sent in an editor. > --compose * Open an editor for introduction. > > Sending: > @@ -130,7 +131,8 @@ my $compose_filename = ".msg.$$"; > > # Variables we fill in automatically, or via prompting: > my (@to,@cc,@initial_cc,@bcclist,@xh, > - $initial_reply_to,$initial_subject,@files,$author,$sender,$smtp_authpass,$compose,$time); > + $initial_reply_to,$initial_subject,@files, > + $author,$sender,$smtp_authpass,$annotate,$compose,$time); > > my $envelope_sender; > > @@ -151,6 +153,17 @@ if ($@) { > # Behavior modification variables > my ($quiet, $dry_run) = (0, 0); > > +# Handle interactive edition of files. s/edition/editing/; -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html