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

[RFH] specifying rebase options when branch.<name>.rebase = true

From
EREric Raible <raible@gmail.com>
Date
Jun 10, 2010, 19:01 UTC
Message-ID
<AANLkTimbBZVWk2EzXIngSV6Kblap1k8mPbfEa8OOGxUh@mail.gmail.com>

In setting up our rebase-based workflow I'd like people to simply use "git pull". But "branch.<name>.rebase=true" gets me only halfway there.

The problem is that I'd like to rebase local merges as well, but have not seen a was to specify the --preserve-merges flag.

Am I missing something obvious?
Next: Eric Raible
Message 1 of 2 in “[RFH] specifying rebase options when branch.<name>.rebase = true”
  1. Eric RaibleJun 10, 2010
  2. Eric RaibleJun 10, 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.