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

"git rebase" behavior change in 2.26.0

From
NKNorbert Kiesel <nkiesel@gmail.com>
Date
Mar 25, 2020, 03:38 UTC
Message-ID
<CAM+g_Nuu2jGuNwUMS3j8=EjOrthYzfVTrUzOxQJ=aYcoBAL3Tg@mail.gmail.com>
Hi,

I track an upstream repo with "pull.rebase = true" where I do a `git pull` followed by a `git log -p ORIG_HEAD..` for a branch to see changes since the last "pull". I normally do not commit to this branch and thus this normally is a "fast-forward" merge.

Starting with 2.26 this no longer works because ORIG_HEAD is always set to HEAD after my `git pull`.

I track other prances from the same repo where I do local changes and then want the `git pull --rebase` and I thus do not want to give up on the `pull.rebase = true` configuration.

Next: Jeff King
Message 1 of 11 in “"git rebase" behavior change in 2.26.0”
  1. Norbert KieselMar 25, 2020
  2. Jeff KingMar 25, 2020
  3. Elijah NewrenMar 25, 2020
  4. Norbert KieselMar 26, 2020
  5. Norbert KieselMar 26, 2020
  6. Elijah NewrenMar 26, 2020
  7. Elijah NewrenMar 26, 2020
  8. Jeff KingMar 26, 2020
  9. Norbert KieselMar 27, 2020
  10. Elijah NewrenMar 27, 2020
  11. Elijah NewrenMar 27, 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.