From: "H.J. Lu" <hjl.tools@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Joel Brobecker <brobecker@adacore.com>,
Will Newton <will.newton@linaro.org>,
ricard.wanderlof@axis.com, GDB <gdb-patches@sourceware.org>
Subject: Re: reject merges on gdb release branches?
Date: Fri, 24 Jan 2014 15:49:00 -0000 [thread overview]
Message-ID: <CAMe9rOqUAYb_CzhAwTfoGGP29GabufJjsP60sS-csZY_-Nnbzg@mail.gmail.com> (raw)
In-Reply-To: <83ob31crka.fsf@gnu.org>
On Fri, Jan 24, 2014 at 7:44 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Fri, 24 Jan 2014 06:45:11 -0800
>> From: "H.J. Lu" <hjl.tools@gmail.com>
>> Cc: Joel Brobecker <brobecker@adacore.com>, Will Newton <will.newton@linaro.org>,
>> ricard.wanderlof@axis.com, GDB <gdb-patches@sourceware.org>
>>
>> I use both rebase and merge. I use merge on hjl/linux/master
>> branch since I need to go back to checkout previous trees on
>> my branch. Rebase won't work for me here.
>>
>> But for hjl/mpx/pltext8 branch, I use rebase since I
>> plan to commit it to master when the work is complete
>> and I don't need to go back in history.
>>
>> I don't care about the history of each commit on master
>> and release branches. Merge will only confuse me.
>> But you can tag your merged commit before rebase or
>> create a branch for it. All history will be there for you
>> and it won't confuse other people.
>
> There's any number of workflows that git allows. As long as master
> only gets pushes that add commits, I don't see why we should force a
> particular workflow and disallow all others. You should be able to
> use yours, and I should be able to use mine. Sorry, but I refuse to
> believe that people who develop and maintain GDB and Binutils are
> confused by a DAG that has a few merges.
How can you do "git bisect" with merged commits? I
know I can't do git bisect" on hjl/linux/applied branch
since I use merge on it.
--
H.J.
next prev parent reply other threads:[~2014-01-24 15:49 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-22 5:11 Joel Brobecker
2014-01-22 5:22 ` Doug Evans
2014-01-22 5:48 ` Yao Qi
2014-01-22 7:37 ` Joel Brobecker
2014-01-22 12:45 ` Yao Qi
2014-01-22 12:37 ` Pedro Alves
2014-01-22 15:35 ` Eli Zaretskii
2014-01-22 16:15 ` Joel Brobecker
2014-01-22 16:23 ` H.J. Lu
2014-01-22 16:39 ` Eli Zaretskii
2014-01-23 7:46 ` Ricard Wanderlof
2014-01-23 16:17 ` Eli Zaretskii
2014-01-24 7:36 ` Ricard Wanderlof
2014-01-24 7:56 ` Eli Zaretskii
2014-01-24 8:07 ` Doug Evans
2014-01-24 8:38 ` Eli Zaretskii
2014-01-24 8:07 ` Joel Brobecker
2014-01-24 8:54 ` Eli Zaretskii
2014-01-24 10:09 ` Will Newton
2014-01-24 10:28 ` Eli Zaretskii
2014-01-24 10:35 ` Will Newton
2014-01-24 10:48 ` Eli Zaretskii
2014-01-24 10:58 ` Joel Brobecker
2014-01-24 11:11 ` Eli Zaretskii
[not found] ` <20140124113014.GN4762@adacore.com>
2014-01-24 11:38 ` Joel Brobecker
2014-01-24 11:39 ` Eli Zaretskii
2014-01-24 11:55 ` Joel Brobecker
2014-01-24 14:27 ` Eli Zaretskii
2014-01-24 14:45 ` H.J. Lu
2014-01-24 15:44 ` Eli Zaretskii
2014-01-24 15:49 ` H.J. Lu [this message]
2014-01-24 16:02 ` Eli Zaretskii
2014-01-24 16:05 ` H.J. Lu
2014-01-24 16:18 ` Andreas Schwab
2014-01-22 16:07 ` Tom Tromey
2014-01-23 5:58 ` Joel Brobecker
2014-01-23 15:35 ` Tom Tromey
2014-01-24 2:18 ` Joel Brobecker
2014-01-24 3:06 ` Tom Tromey
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=CAMe9rOqUAYb_CzhAwTfoGGP29GabufJjsP60sS-csZY_-Nnbzg@mail.gmail.com \
--to=hjl.tools@gmail.com \
--cc=brobecker@adacore.com \
--cc=eliz@gnu.org \
--cc=gdb-patches@sourceware.org \
--cc=ricard.wanderlof@axis.com \
--cc=will.newton@linaro.org \
/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