I ran a "pull" today morning w/o sufficient coffee and thus forgot to disable the "pull.rebase" and was bitten by that again. Here is what I see when using "GIT_TRACE2=1 git -c pull.rebase=true pull --ff-only": ... 10:54:50.578673 run-command.c:735 child_start[2] git merge --ff-only FETCH_HEAD 10:54:50.580385 common-main.c:48 version 2.26.0 10:54:50.580404 common-main.c:49 start /usr/lib/git-core/git merge --ff-only FETCH_HEAD 10:54:50.580587 repository.c:130 worktree /home/nkiesel/work/Platform 10:54:50.580785 git.c:440 cmd_name merge (pull/merge) Already up to date. 10:54:50.589803 git.c:674 exit elapsed:0.009835 code:0 10:54:50.589827 trace2/tr2_tgt_normal.c:123 atexit elapsed:0.009874 code:0 10:54:50.590887 run-command.c:990 child_exit[2] pid:939370 code:0 elapsed:0.012205 10:54:50.590919 run-command.c:735 child_start[3] git rebase --onto d0527895a4df44f00162b68011b803e597fd400f d0527895a4df44f00162b68011b803e597fd400f 10:54:50.592396 common-main.c:48 version 2.26.0 10:54:50.592412 common-main.c:49 start /usr/lib/git-core/git rebase --onto d0527895a4df44f00162b68011b803e597fd400f d0527895a4df44f00162b68011b803e597fd400f 10:54:50.592568 repository.c:130 worktree /home/nkiesel/work/Platform 10:54:50.592714 git.c:440 cmd_name rebase (pull/rebase) 10:54:50.593142 builtin/rebase.c:1669 cmd_mode undefined 10:54:50.614154 run-command.c:735 child_start[0] git checkout d0527895a4df44f00162b68011b803e597fd400f 10:54:50.678813 run-command.c:990 child_exit[0] pid:939392 code:0 elapsed:0.064656 Successfully rebased and updated refs/heads/nextrelease. 10:54:50.697724 git.c:674 exit elapsed:0.105715 code:0 10:54:50.697734 trace2/tr2_tgt_normal.c:123 atexit elapsed:0.105729 code:0 10:54:50.698307 run-command.c:990 child_exit[3] pid:939371 code:0 elapsed:0.107373 10:54:50.698343 git.c:674 exit elapsed:5.904200 code:0 10:54:50.698354 trace2/tr2_tgt_normal.c:123 atexit elapsed:5.904211 code:0 I would argue that "--ff-only" would mean to never rebase, but clearly git runs a rebase of HEAD onto HEAD and i assume by that setting ORIG_HEAD to HEAD as colloquial damage.
