On Mon, Nov 23, 2020 at 1:17 PM Theodore Y. Ts'o <tytso@xxxxxxx> wrote: > If your repository is effectively a leaf repo, then rebasing may be > harmless, although there are still who don't like rebasing because it > invalidates your previous testing. My personal preference is to do a > git fetch, followed by a git merge --ff-only, and if that errors out, > then I know I need to take a bit more care before deciding what to do > next. Which is why I suggested to make fast-forward-only the default: https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@xxxxxxxxx/ In what case would that default not be what most people want? -- Felipe Contreras
