Björn Steinbrink:
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.
Exactly!
What I meant to say in the original message was that conceptually, the
difference between a "git rebase --reverse A..B", a "git cherry-pick A..B"
and a "git merge --squash A..B" is minute.
And when continuing the thought experiment, the step from "git merge
--squash A..B" to "git merge A..B" is not very large either, just (a
lot) more difficult to implement.
--
\\// Peter - http://www.softwolves.pp.se/
--
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