Elijah Newren <newren@xxxxxxxxx> writes: >> $ git checkout master^0 >> $ git merge --no-commit next >> warning: defaulting to --no-ff, given a --no-commit request >> Automatic merge went well; stopped before committing as requested >> hint: if you'd rather have a fast-forward without creating a commit, >> hint: do "git reset --keep next" now. > > Good points. I thought of this last one before sending, though > without pre- and post- warnings/hints; without such text it definitely > seemed too magical and possibly leading to unexpected surprises in a > different direction, so I dismissed it without further thought. But > the warnings/hints help. > >> I do not have a strong preference among three (the third option >> being not doing anything), but if pressed, I'd say that the last one >> might be the most user-friendly, even though it feels a bit too >> magical and trying to be smarter than its own good. > > I also lack a strong preference. Maybe mark it #leftoverbits for > someone that does? This definitely is outside the scope of the documentation update.
