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

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 3, 2015, 23:15 UTC
Message-ID
<xmqq61ahad18.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20150303214653.GQ890@serenity.lan>
John Keeping <john@keeping.me.uk> writes:
Show 6 quoted lines
> git-rebase assumes that if you give an explicit upstream then you want
> precisely what you asked for.  From git-rebase(1):
>
> 	If either <upstream> or --root is given on the command line,
> 	then the default is `--no-fork-point`, otherwise the default is
> 	`--fork-point`.
Correct.

You ask it to rebase the history without guessing by being explicit; the command guesses when you are not explicit and being lazy ;-).

Previous: John KeepingNext: Mike Botsko
Message 5 of 9 in “Unexpected/unexplained difference between git pull --rebase and git rebase”
  1. Mike BotskoMar 3, 2015
  2. John KeepingMar 3, 2015
  3. Mike BotskoMar 3, 2015
  4. John KeepingMar 3, 2015
  5. Junio C HamanoMar 3, 2015
  6. Mike BotskoMar 3, 2015
  7. John KeepingMar 3, 2015
  8. Mike BotskoMar 3, 2015
  9. John KeepingMar 4, 2015

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.