From: Sergei Organov <osv@javad•com>
To: Jonathan Nieder <jrnieder@gmail•com>
Cc: "Besen\, David" <david.besen@hp•com>,
"git\@vger.kernel.org" <git@vger•kernel.org>
Subject: Re: Amending merge commits?
Date: Mon, 28 Jul 2014 23:37:42 +0400 [thread overview]
Message-ID: <87vbqhb7g9.fsf@osv.gnss.ru> (raw)
In-Reply-To: <20140725223146.GM12427@google.com> (Jonathan Nieder's message of "Fri, 25 Jul 2014 15:31:46 -0700")
Jonathan Nieder <jrnieder@gmail•com> writes:
> David Besen wrote:
>> Jonathan Nieder wrote:
>
>>> This is how pull --rebase works. It turns your single-parent commits
>>> into a sequence of patches on top of upstream and completely ignores
>>> your merge commits.
>>>
>>> There is a --rebase=preserve option that makes a halfhearted attempt
>>> to preserve your merges --- perhaps that would help? The
>>> git-rebase(1) documentation has more details.
>>
>> Ah thanks, I'll RTFM better in the future.
>
> No, not a problem. It's very useful to see examples of where git's
> behavior was counterintuitive and the documentation was more obscure
> than it could have been.
Should documentaion warn that "git pull --rebase=true" (and
pull.merge=true configuration) could be harmful, and that
--rebase=preserve (and pull.merge=preserve) should better be used
instead?
Is there any scenario at all where pull --rebase=true wins over
preserve?
--
Sergey.
next prev parent reply other threads:[~2014-07-28 19:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 22:03 Amending merge commits? 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 [this message]
2014-07-28 20:00 ` Jonathan Nieder
2014-07-28 20:53 ` Sergei Organov
-- strict thread matches above, loose matches on Subject: below --
2014-07-28 21:47 Nico Williams
2014-07-29 9:58 ` Sergei Organov
2014-07-29 15:44 ` Nico Williams
2014-07-29 19:29 ` Philip Oakley
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
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=87vbqhb7g9.fsf@osv.gnss.ru \
--to=osv@javad$(echo .)com \
--cc=david.besen@hp$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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