On Thursday 11 March 2010 19:01:42 Reuben Thomas wrote: > having done some more work on my patch #7017, I pulled updates from > master to make sure I had no conflicts, which worked fine, but now I > have a commit after those updates, and a commit before, which I want > to merge in some way to get a single patch. I'm afraid this is outside > my knowledge of git: what do I do?
use rebase. i think this might do what you want: - git rebase -i origin/master - re-order the commits and then change "pick" to "s" for each commit you want to squash into a previous one -mike
signature.asc
Description: This is a digitally signed message part.
