On Tue, Apr 26, 2016 at 5:37 PM, Junio C Hamano <gits...@pobox.com> wrote: > A user who uses "--no-commit" does so with the intention to record a > resulting merge after amending the merge result in the working tree. > But there is nothing to amend and record, if the same "git merge" > without "--no-commit" wouldn't have created a merge commit (there > are two cases: (1) the other branch is a descendant of the current > branch, (2) the other branch is an ancestor of the current branch). > > The user would want to know that before doing further damange to his
s/damange/damage/ > history. When "merge --no-commit" fast-forwarded or succeeded with > "already up-to-date" or "fast-forward", give a warning message. > > We may want to turn this into a die() after a transition period. > > Signed-off-by: Junio C Hamano <gits...@pobox.com> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
