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

Should "pull --rebase" try to be a little cleverer?

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 21, 2008, 15:47 UTC
Message-ID
<alpine.LSU.1.00.0801211542150.5731@racer.site>
Hi,

last night an idea hit me: if I "git pull --rebase blabla master", it could be that "blabla" decided to rebase "master" already, and ATM this would lead to quite a few conflicts, since commits that were not mine were rewritten.

However, if we already have refs/remotes/blabla/master, we could DWIM the --rebase call to

	git rebase --onto FETCH_HEAD refs/remotes/blabla/master

Of course, this would mean that git-pull would need to source git-parse-remote again...

Ciao, Dscho

Next: Nicolas Pitre
Message 1 of 8 in “Should "pull --rebase" try to be a little cleverer?”
  1. Johannes SchindelinJan 21, 2008
  2. Nicolas PitreJan 21, 2008
  3. Johannes SchindelinJan 21, 2008
  4. Nicolas PitreJan 21, 2008
  5. Junio C HamanoJan 21, 2008
  6. pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin, Jan 26, 2008
  7. Junio C HamanoJan 26, 2008
  8. Johannes SchindelinJan 26, 2008

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.