>>> Elijah Newren <newren@xxxxxxxxx> schrieb am 18.02.2019 um 19:41 in Nachricht <20190218184147.7563-1-newren@xxxxxxxxx>: > Hi Ulrich, > > Sorry for the late reply... No problem, thanks for the explanation. I'll "fast forward" directly to the patch below and comment inline: -- Ulrich [...] > ‑‑ 8< ‑‑ > Subject: [PATCH] merge‑options.txt: correct wording of ‑‑no‑commit option > > The former wording implied that ‑‑no‑commit would always cause the > merge operation to abort and allow the user to make further changes I think "abort" is not the perfect word, because the merge would rather be "paused for commit" in my understanding; a "git merge --abort" is different, right? > and/or provide a special commit message for the merge commit. This > is not the case for fast‑forward merges, as there is no merge commit > to create. Without a merge commit, there is no place where it makes > sense to "stop the merge and allow the user to tweak changes"; doing > that would require a full rebase of some sort. ...and before trying the merge it's not always obvious whether the merge will be fast-forward type or not. So actually the outcome of --no-commit depends on the conents being merged, not on the command line options. > > Modify the wording to correctly address fast‑forward cases as well, > and suggest using ‑‑no‑ff with ‑‑no‑commit if the point is to ensure > that the merge aborts. > > Reported‑by: Ulrich Windl <Ulrich.Windl@xxxxxx‑regensburg.de> > Signed‑off‑by: Elijah Newren <newren@xxxxxxxxx> > ‑‑‑ > Documentation/merge‑options.txt | 12 +++++++++‑‑‑ > 1 file changed, 9 insertions(+), 3 deletions(‑) > > diff ‑‑git a/Documentation/merge‑options.txt b/Documentation/merge‑options.txt > index c2a263ba74..d1061b8cf7 100644 > ‑‑‑ a/Documentation/merge‑options.txt > +++ b/Documentation/merge‑options.txt > @@ ‑3,9 +3,15 @@ > Perform the merge and commit the result. This option can > be used to override ‑‑no‑commit. > + > ‑With ‑‑no‑commit perform the merge but pretend the merge > ‑failed and do not autocommit, to give the user a chance to > ‑inspect and further tweak the merge result before committing. > +With ‑‑no‑commit perform the merge and stop just before creating > +a merge commit, to give the user a chance to inspect and further > +tweak the merge result before committing. > ++ > +Note that fast‑forward updates do not need to create a merge > +commit and therefore there is no way to stop those merges with > +‑‑no‑commit. Thus, if you want to ensure your branch is not > +changed or updated by the merge command, use ‑‑no‑ff with > +‑‑no‑commit. > > ‑‑edit:: > ‑e:: > ‑‑ > 2.21.0.rc1.264.g6c9e06a32d
