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

Re: Amending merge commits?

From
NWNico Williams <nico@cryptonector.com>
Date
Jul 28, 2014, 21:47 UTC
Message-ID
<CAK3OfOjr6ej5VdGU=bLmtag9cca1=ogLxVakCFTMG7b-A2uBiA@mail.gmail.com>
On Mon, Jul 28, 2014 at 3:00 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
Show 10 quoted lines
> Sergei Organov wrote:
>
>> Is there any scenario at all where pull --rebase=true wins over
>> preserve?
>
> Basically always in my book. ;-)
>
> When people turn on 'pull --rebase', they are asking for a clean,
> simplified history where their changes are small discrete patches in a
> clump on top of upstream.
+1.  Words to develop by.

There are exceptions. E.g., when you pull commits from multiple [forked] upstreams, then you can't keep your local commits on top.

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.

Nico --

Next: Sergei Organov
Message 1 of 10 in “Re: Amending merge commits?”
  1. Nico WilliamsJul 28, 2014
  2. Sergei OrganovJul 29, 2014
  3. Nico WilliamsJul 29, 2014
  4. Philip OakleyJul 29, 2014
  5. Nico WilliamsJul 29, 2014
  6. Philip OakleyJul 29, 2014
  7. Nico WilliamsJul 29, 2014
  8. Sergei OrganovJul 30, 2014
  9. Nico WilliamsJul 30, 2014
  10. Sergei OrganovJul 30, 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.