0

I have set git config --global pull.rebase merges like this question in SO: git pull --rebase: passing --rebase-merges

but It doesn't work when I do git pull

The version I use is git version 2.38.1.windows.1

git pull --rebase seems like works

Update:
I have also set pull.ff=only.
git pull does not work, complains git pull not possible to fast-forward aborting

Liu Hao
  • 472
  • 4
  • 24
  • How does git behave _now_? As if the option were selected in the old days? – eftshift0 Oct 27 '22 at 08:16
  • What do you mean by "doesn't work"? The source code suggests that it should in fact work. (@AndreasLouv: did you mean `--preserve-merges` here? This was removed in Git 2.34.) – torek Oct 27 '22 at 08:57
  • @eftshift0 It complains "git pull not possible to fast-forward aborting" – Liu Hao Oct 27 '22 at 09:05
  • The question is for @AndreasLouv (and now also torek could also explain). – eftshift0 Oct 27 '22 at 09:49
  • Just checked and `--rebase-merges` is still fine and well, at least in terms of rebase options: https://github.com/git/git/blob/master/builtin/rebase.c#L1148 – eftshift0 Oct 27 '22 at 12:57

1 Answers1

1

Do you mean git config --global pull.rebase true?

Ziming Song
  • 1,176
  • 1
  • 9
  • 22