Hans Weltar writes:
> When you have a fast-forwardable merge commit, you can amend this
> commit to hold additional changes.
The real issue may be that there is a difference between "you can"
and "it is a good idea to", though ;-)
I think the fast-forwardable-ness is a red herring in your examp
When you have a fast-forwardable merge commit, you can amend this
commit to hold additional changes.
When you now do a rebase, git will believe this merge-commit is
fast-forwardable, and will delete all amended changes.
I believe when you amend a merge-commit it should become non-fastforwardable.
2 matches
Mail list logo
