Junio C Hamano writes:
> Andrew Ardill writes:
>
>> I do think that the --no-commit option should imply --no-ff (as this
>> would make the behaviour consistent for end-users). I don't know if
>> this is something that would break scripts etc, but if so you could
>> make it implied only if we det
Andrew Ardill writes:
> Yes, I think the mis-alignment in expectations comes from a
> technicality in the description you quote. The fast forward is in some
> ways not really counted as a true merge, and no new commits are
> created.
Looking at 123ee3ca (Add --no-commit to git-merge/git-pull.,
2
On 18 April 2016 at 17:23, Christoph Paulik wrote:
> My expectations from what should happen came mainly from the description of
> the --no-commit flag in the help:
>
> With --no-commit perform the merge but pretend the merge failed and do not
> autocommit, to give the user a chance to inspect and
My expectations from what should happen came mainly from the
description of the --no-commit flag in the help:
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.
So
On 18 April 2016 at 16:26, Johannes Schindelin
wrote:
>
> > The command only works as expected when also adding the --no-ff flag.
>
> Then you need to fix your expectations ;-)
I *think* the core of this problem is that the intent of the end-user
does not align with the command options available.
Hi Christoph,
On Sun, 17 Apr 2016, Christoph Paulik wrote:
> git merge branch --no-commit does commit fast forward merges leaving
> users no way to change the merge results.
No, this is not a bug. Please note that a fast-forward does not perform a
commit at all (and therefore "does
On Sun, Apr 17, 2016 at 2:10 PM, Christoph Paulik wrote:
>
> Hi Git Mailinglist,
> git merge branch --no-commit does commit fast forward merges leaving users
> no way to change the merge results. The command only works as expected when
> also adding the --no-ff flag. Looking at t
Hi Git Mailinglist,
git merge branch --no-commit does commit fast forward merges
leaving users no way to change the merge results. The command only
works as expected when also adding the --no-ff flag. Looking at
the help text of the --no-commit flag I think that this might be a
unintended
8 matches
Mail list logo
