17/03/2014 21:59, Vincent van Ravesteijn:
Yes there is. You can do:
$ git checkout str-metrics
$ git reset <last_commit_of_the_old_branch>
The <last_commit_of_the_old_branch> you can see in the e-mail. I guess
it is either the first or the last line which starts with "discards ...".
OK, I did that. Now I would like to do commit squashing/fixup, but
without the actual rebase operation that "rebase -i" would entail. How
can I do that?
The problem may come from the fact that I did a couple merges with
master, and I am not sure how to avoid to pollute my branch with them:
I'd like to keep that as merge points, or whatever does not entail
mixing my commits with the stuff from master.
Any hint?
JMarc
