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

Re: [PATCH] rebase -p: Preserve fast-forwardable merges

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 25, 2010, 14:10 UTC
Message-ID
<alpine.DEB.1.00.1001251508400.8733@intel-tinevez-2-302>
In-Reply-To
<dd10f5481001222329i58e7b709m2c547c74161b6771@mail.gmail.com>
Hi,
On Fri, 22 Jan 2010, Alex Scarborough wrote:
> Previously, rebase -p would not preserve a merge commit if the merge
> could be resolved as a fast-forward.  rebase -p now passes --no-ff to
> git merge when recreating a merge commit, which ensures that merge
> commits created with git merge --no-ff are preserved.

For my use case (well, it used to be my use case), namely keeping a number of topic branches on top of an upstream up-to-date, this is not the desired action. In my use case, merged topic branches should just vanish, and not even leave a merge commit.

> First patch, so here's hoping neither I nor my mail client messed up
> too much.

I think you did real fine, even providing a test case, which not many submitters do!

Ciao, Dscho

Previous: Alex ScarboroughNext: Alex Scarborough
Message 2 of 4 in “rebase -p: Preserve fast-forwardable merges”
  1. rebase -p: Preserve fast-forwardable mergesAlex Scarborough, Jan 23, 2010
  2. Johannes SchindelinJan 25, 2010
  3. Alex ScarboroughJan 25, 2010
  4. Johannes SchindelinJan 26, 2010

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.