From: "Philip Oakley" <philipoakley@iee.org>
To: "Nico Williams" <nico@cryptonector.com>,
"Sergei Organov" <osv@javad.com>
Cc: "Jonathan Nieder" <jrnieder@gmail.com>,
"Besen, David" <david.besen@hp.com>, <git@vger.kernel.org>
Subject: Re: Amending merge commits?
Date: Tue, 29 Jul 2014 20:29:20 +0100 [thread overview]
Message-ID: <DFE66A48CBC646E795B3B4A0903AB19E@PhilipOakley> (raw)
In-Reply-To: CAK3OfOhFzbUA7gZbox84W=VC+0aSuiNc-XRP_MTyYy1UeFFzZQ@mail.gmail.com
From: "Nico Williams" <nico@cryptonector.com>
> On Tue, Jul 29, 2014 at 4:58 AM, Sergei Organov <osv@javad.com> wrote:
>> Nico Williams <nico@cryptonector.com> writes:
>>> That exception aside, keeping all local commits "on top" by always
>>> rebasing them onto the upstream is extremely useful: a) in
>>> simplifying
>>> conflict resolution, b) making it easy to identify
>>> as-yet-unintegrated
>>> local commits, c) making it easy to contribute local commits.
>>
>> But 'pull --rebase=preserve' does rebase local commits onto the
>> upstream, and result is exactly the same as 'pull --rebase=true',
>> unless
>> you have some of your own merges to be rebased. That's where the
>> difference between these two options appears. It's --rebase=false
>> that
>> performs merges rather than rebase.
>
> Local merge commits mean that you either didn't rebase to keep all
> your local commits on top of the upstream, or that you have multiple
> upstreams (the example exception I gave).
>
> Conversely, if you always rebase your local commits on top of the
> upstream then you won't have merge commits to worry about.
>
Whilst it may not be "the Git Way", I'd expect that in many less well
informed companies, the need to keep merge commits fom other lines of
development would be quite a common (political ) technique where some
preparatory branch needs to be merged in before one's feature can be
completed (similar to all those cases on the list when folk say 'builds
on top of xy's commit deadbeaf)
Philip
next prev parent reply other threads:[~2014-07-29 19:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 21:47 Amending merge commits? Nico Williams
2014-07-29 9:58 ` Sergei Organov
2014-07-29 15:44 ` Nico Williams
2014-07-29 19:29 ` Philip Oakley [this message]
2014-07-29 20:19 ` Nico Williams
2014-07-29 21:38 ` Philip Oakley
2014-07-29 22:07 ` Nico Williams
2014-07-30 8:42 ` Sergei Organov
2014-07-30 17:43 ` Nico Williams
2014-07-30 18:28 ` Sergei Organov
-- strict thread matches above, loose matches on Subject: below --
2014-07-25 22:03 Besen, David
2014-07-25 22:11 ` David Besen
2014-07-25 22:19 ` Jonathan Nieder
2014-07-25 22:23 ` Besen, David
2014-07-25 22:31 ` Jonathan Nieder
2014-07-28 19:37 ` Sergei Organov
2014-07-28 20:00 ` Jonathan Nieder
2014-07-28 20:53 ` Sergei Organov
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=DFE66A48CBC646E795B3B4A0903AB19E@PhilipOakley \
--to=philipoakley@iee.org \
--cc=david.besen@hp.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=nico@cryptonector.com \
--cc=osv@javad.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.