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
PSPhillip Susi <phill@thesusis.net>
Date
Dec 11, 2020, 13:46 UTC
Message-ID
<87a6uk78rl.fsf@vps.thesusis.net>
In-Reply-To
<ea1e654cec62411884e2c260524fb05a@deshaw.com>
Shupak, Vitaly writes:
> "git pull --rebase" requires having NO uncommitted changes, even if
> the locally modified files haven't been updated upstream, or even if
> there are no changes to upstream at all. I know I could use

It isn't just about whether upstream has changed those same files, but also would fail if any of your commits have.

> --autostash, but that's inefficient and may be undesirable if it would
> create a conflict.

If that creates a conflict, then the pull would definitely fail if it had been attempted.

Previous: brian m. carlson
Message 5 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.