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

Re: "git rebase" behavior change in 2.26.0

From
NKNorbert Kiesel <nkiesel@gmail.com>
Date
Mar 26, 2020, 01:46 UTC
Message-ID
<CAM+g_NsUfw6zDRj8H1VNdheKFSHgC9gz7nVy0vbtpTKkYzjjtA@mail.gmail.com>
In-Reply-To
<CAM+g_Nvt3X4d5cjKajzDOcoDgNS4bVkj3a0KvVm4yDEW-J7v2w@mail.gmail.com>
Here is a concrete example:
lt-nkiesel:~Platform(nextrelease)% git -c rebase.backend=merge -c
pull.rebase=false -c branch.nextrelease.rebase=true pull
remote: Enumerating objects: 1, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 1 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (1/1), 279 bytes | 279.00 KiB/s, done.
From msgit.rnd.metricstream.com:platform/Platform7
   d008080d3f2..db4042856da  nextrelease -> origin/nextrelease
Updating d008080d3f2..db4042856da
Fast-forward
 modules/bpcsfw/src/main/java/com/metricstream/systemi/client/servlet/servant/BaseViewController.java
| 54 +++++++++++++++++++++++++-----------------------------
 modules/bpcsfw/src/main/java/com/metricstream/util/HttpUtils.java
                               |  5 +++++
 2 files changed, 30 insertions(+), 29 deletions(-)
Successfully rebased and updated refs/heads/nextrelease.
lt-nkiesel:~Platform(nextrelease)% git rev-parse ORIG_HEAD
db4042856da8338f183c831fca92cf63da7988bd
lt-nkiesel:~Platform(nextrelease)% git rev-parse HEAD
db4042856da8338f183c831fca92cf63da7988bd
lt-nkiesel:~Platform(nextrelease)%

As you can see, git said "Fast-forward" (i.e. no need to rebase) but nevertheless after that pull ORIG_HEAD is identical to HEAD

Previous: Norbert KieselNext: Elijah Newren
Message 5 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.