On Thu, Jul 18, 2019 at 11:40 PM Edmundo Carmona Antoranz
wrote:
>
> Using --squash made git stop regardless of conflicts so that the
> user could finish the operation with a later call to git-commit.
>
> Now --squash --commit allows for the operation to finish with the
> new revision if there are
Using --squash made git stop regardless of conflicts so that the
user could finish the operation with a later call to git-commit.
Now --squash --commit allows for the operation to finish with the
new revision if there are no conflicts. If the user does not use
--commit, then --no-commit is used as
2 matches
Mail list logo
