From: Joel Brobecker <brobecker@adacore.com>
To: Pierre Muller <pierre.muller@ics-cnrs.unistra.fr>
Cc: archer@sourceware.org
Subject: Re: [Archer] RE: [Archer] Re: [Archer] Archer git account inquiry
Date: Wed, 23 Feb 2011 09:19:00 -0000 [thread overview]
Message-ID: <20110223091930.GR2617@adacore.com> (raw)
In-Reply-To: <000f01cbd339$32d6b6c0$98842440$@muller@ics-cnrs.unistra.fr>
> So my main question is: what do you use to create your email series
> with sub-patches? -- git alone? or stgit, guilt or Quilt?
I use git alone (in particular "git rebase -i").
> How do you handle ChangeLog entries for instance?
> do you really put them into the commits, but then
> they would appear formatted as a diff in the patch also
> or do you have special scripts for this?
I write the CL entry in the revision history only until the time when
I push the change to CVS. That's when I edit the commit again (using
"git rebase -i"), adding the ChangeLog entries. I do it at the very
last second, because otherwise you have a higher chance of having
a conflict when you export to CVS.
Note also a super-useful command: git cvsexportcommit. It automates
the pushing of a given patch to CVS.
--
Joel
next prev parent reply other threads:[~2011-02-23 9:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 13:27 Pierre Muller
2011-02-21 14:22 ` [Archer] " Joel Brobecker
2011-02-21 14:34 ` Tom Tromey
2011-02-22 4:25 ` [Archer] " Joel Brobecker
2011-02-23 3:30 ` Joel Brobecker
2011-02-23 9:08 ` Pierre Muller
2011-02-23 9:19 ` Joel Brobecker [this message]
2011-02-23 20:21 ` Tom Tromey
2011-02-24 11:01 ` Jan Kratochvil
2011-02-24 11:11 ` Pierre Muller
2011-02-24 11:20 ` Pierre Muller
2011-02-24 11:29 ` Jan Kratochvil
2011-02-23 20:23 ` Tom Tromey
2011-02-24 3:22 ` [Archer] " Joel Brobecker
2011-02-21 14:31 ` Tom Tromey
2011-02-24 11:05 ` Pierre Muller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110223091930.GR2617@adacore.com \
--to=brobecker@adacore.com \
--cc=archer@sourceware.org \
--cc=pierre.muller@ics-cnrs.unistra.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).