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

Re: Why does "git pull --rebase" require a clean git directory?

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Dec 12, 2020, 11:29 UTC
Message-ID
<X9SpmGKUVgrSBy9j@camp.crustytoothpaste.net>
In-Reply-To
<f5b5b94830ca45b69440c0ebc1de5e69@deshaw.com>
On 2020-12-11 at 21:23:23, Shupak, Vitaly wrote:
> Thanks for the explanation. It seems like some optimizations may still
> be possible. For example, if the pull could be done with a
> fast-forward merge, then you don't need to rebase at all. This could
> be an option like pull.rebase=noffonly.

Yeah, I agree that if our operation is a fast-forward, that could be done in a pretty straightforward way. It's still a little tricky because of how the current code works (the fast-forward logic is in the sequencer, which gets called after the check), but it's something that we could add more easily.

-- 
brian m. carlson (he/him or they/them)
Houston, Texas, US
Previous: Shupak, VitalyNext: Phillip Susi
Message 4 of 5 in “Why does "git pull --rebase" require a clean git directory?”
  1. Shupak, VitalyDec 10, 2020
  2. brian m. carlsonDec 11, 2020
  3. Shupak, VitalyDec 11, 2020
  4. brian m. carlsonDec 12, 2020
  5. Phillip SusiDec 11, 2020

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.