* git cherry-pick -x
@ 2014-04-20 8:10 Eli Zaretskii
2014-04-21 16:06 ` Joel Brobecker
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2014-04-20 8:10 UTC (permalink / raw)
To: gdb-patches
What are the views here on using the -x switch to git cherry-pick,
when cherry-picking commits from master to a release branch? Is that
deemed useful? If so, should we always use it?
TIA
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git cherry-pick -x
2014-04-20 8:10 git cherry-pick -x Eli Zaretskii
@ 2014-04-21 16:06 ` Joel Brobecker
2014-04-21 16:12 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Joel Brobecker @ 2014-04-21 16:06 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: gdb-patches
> What are the views here on using the -x switch to git cherry-pick,
> when cherry-picking commits from master to a release branch? Is that
> deemed useful? If so, should we always use it?
My personal view on this is that I have never found the extra message
to be all that useful to have, but I don't mind them. Watch out for
one little nit: If the revision log is a single-line log, then the
extra info is added right after it, breaking the convention that the
second line of revision logs should always be empty.
--
Joel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git cherry-pick -x
2014-04-21 16:06 ` Joel Brobecker
@ 2014-04-21 16:12 ` Eli Zaretskii
2014-04-21 16:13 ` Joel Brobecker
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2014-04-21 16:12 UTC (permalink / raw)
To: Joel Brobecker; +Cc: gdb-patches
> Date: Mon, 21 Apr 2014 09:06:51 -0700
> From: Joel Brobecker <brobecker@adacore.com>
> Cc: gdb-patches@sourceware.org
>
> Watch out for one little nit: If the revision log is a single-line
> log, then the extra info is added right after it, breaking the
> convention that the second line of revision logs should always be
> empty.
Don't we always include the ChangeLog entries after the 1st line of
the commit message?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git cherry-pick -x
2014-04-21 16:12 ` Eli Zaretskii
@ 2014-04-21 16:13 ` Joel Brobecker
0 siblings, 0 replies; 4+ messages in thread
From: Joel Brobecker @ 2014-04-21 16:13 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: gdb-patches
> > Watch out for one little nit: If the revision log is a single-line
> > log, then the extra info is added right after it, breaking the
> > convention that the second line of revision logs should always be
> > empty.
>
> Don't we always include the ChangeLog entries after the 1st line of
> the commit message?
Right - something I meant to say, that it's likely not going to affect
us, except in unusual situations maybe.
--
Joel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-04-21 16:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-20 8:10 git cherry-pick -x Eli Zaretskii
2014-04-21 16:06 ` Joel Brobecker
2014-04-21 16:12 ` Eli Zaretskii
2014-04-21 16:13 ` Joel Brobecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox