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

git pull --rebase should use fast forward merge if possible

From
Nneuling@dakosy.de <neuling@dakosy.de>
Date
Jun 29, 2016, 16:18 UTC
Message-ID
<OF95D98CB6.47969C1C-ONC1257FE1.0058D980-C1257FE1.0059986D@dakosy.de>
Hi,

since I have added "pull.rebase=preserve" to my global configuration I wonder why "git pull" also trys to rebase if a fast forward merge is possible.

A fast forward merge would speed up every pull if your local branch contains no new commits and the remote branch is ahead. The result would be the same.

Is it possible to change the behavior of "git pull --rebase=true|preserve|interactive" to use a fast forward merge if the remote branch is ahead and the local branch contains no new commits?

Regards, Mattias

Next: Junio C Hamano
Message 1 of 9 in “git pull --rebase should use fast forward merge if possible”
  1. neuling@dakosy.deJun 29, 2016
  2. Junio C HamanoJun 29, 2016
  3. Junio C HamanoJun 29, 2016
  4. Stefan BellerJun 29, 2016
  5. Junio C HamanoJun 29, 2016
  6. Re* git pull --rebase should use fast forward merge if possibleJunio C Hamano, Dec 1, 2016
  7. Stefan BellerDec 1, 2016
  8. Junio C HamanoDec 1, 2016
  9. Stefan BellerDec 1, 2016

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.