worley@xxxxxxxxxxxx (Dale R. Worley) writes: > (git version 1.7.7.6) > > I've been learning how to use Git. While exploring "git rebase", I've > discovered that if the branch being rebased contains an "evil" merge, > that is, a merge which contains changes that are in addition to the > changes in any of the parent commits, the rebase operation will > silenty lose those additional changes. I think this is to be expected for "git rebase", as it does not even look at merges. It is a way to find non-merge commits that haven't been applied yet, and apply them to the upstream to create a new linear history. -- 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