On Sun, Jun 27, 2021 at 9:16 PM Felipe Contreras
[off-list ref] wrote:
The idea came after a comment from Linus Torvalds regarding what should
be the default mode of "git pull" and why [1].
[1] https://lore.kernel.org/git/CA+55aFz2Uvq4vmyjJPao5tS-uuVvKm6mbP7Uz8sdq1VMxMGJCw@mail.gmail.com/ (local)
Oh wow, I didn't realize that Linus gave his opinion on the subject
back in 2013, and he suggested doing nearly exactly what we are trying
to do now.
quoted hunk ↗ jump to hunk
---no-rebase::
- Override earlier --rebase.
+-m::
+--merge::
+ Force a merge.
++
+Previously this was --no-rebase, but that usage has been deprecated.
I don't think --no-rebase should be "deprecated", at least not yet.
After all, the equivalent config option is still pull.rebase=false.
Also, --merge doesn't necessarily force a merge because it does not
imply --no-ff. I would prefer to list --no-rebase, -m, and --merge
together on the same line and leave the description alone.
But other than the documentation and the commit message, I like the
idea here, and I think it will make Git a lot more user-friendly.
-Alex