On 2009.12.09 12:48:24 +0100, Andreas Schwab wrote: > Björn Steinbrink <B.Steinbrink@xxxxxx> writes: > > > Err, no. "git merge --squash foo" merges all changes from the merge base > > of HEAD and foo up to foo. "git cherry-pick foo" takes just the changes > > from foo^ to foo. For example: > > > > A---B---C (master) > > \ > > D---E---F (foo) > > > > git cherry-pick foo # Tries to create a new commit with the changes from > > # "git diff D F" > > Did you mean "git diff E F"? Ugh, yes, of course. Thanks. Björn -- 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