git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Amending merge commits?

From
SOSergei Organov <osv@javad.com>
Date
Jul 28, 2014, 19:37 UTC
Message-ID
<87vbqhb7g9.fsf@osv.gnss.ru>
In-Reply-To
<20140725223146.GM12427@google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 16 quoted lines
> 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.
Previous: Jonathan NiederNext: Jonathan Nieder
Message 6 of 8 in “Amending merge commits?”
  1. Besen, DavidJul 25, 2014
  2. David BesenJul 25, 2014
  3. Jonathan NiederJul 25, 2014
  4. Besen, DavidJul 25, 2014
  5. Jonathan NiederJul 25, 2014
  6. Sergei OrganovJul 28, 2014
  7. Jonathan NiederJul 28, 2014
  8. Sergei OrganovJul 28, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.