Hans Weltar <hansweltar@xxxxxxxxx> 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 example; rebase by default replays the patches commit by commit to flatten the history, and evil merges where your result does not match a mechanical merge result will be lost, and that is true even if you were dealing with a real merge. I'd imagine that you would need something like http://thread.gmane.org/gmane.comp.version-control.git/198125/focus=198516 where it proposes a mode of rebase that picks the change in the first parent chain. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html