From: Howard Miller Date: Thu, 22 Oct 2009 21:24:22 GMT Subject: Re: Any way to "flatten" a series of changes in git Message-ID: <26ae428a0910221424n9f45d9bg379fb6609b4eace0@mail.gmail.com> In-Reply-To: <26ae428a0910221411l73aa7cbak5c060925ccdf4cea@mail.gmail.com> 2009/10/22 Howard Miller : >> You can use either "git merge --squash" or "git rebase --interactive" >> (changing 'pick' to 'squash'). >> > > Actually thinking some more.... I don't understand something about > this. I don't actually want to merge or rebase with anything. I just > want to say "make those commits a series of commits on a branch into > just one commit with a new message". I seriously suspect I'm missing > the point somewhere but what has that got to do with merging or > rebasing? > > Thanks again > Oh..... more reading of the help. It's this I take it... " For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call git-rebase like this: $ git rebase -i HEAD~5" Would it be ungrateful to suggest that the existence of that option isn't clear from the synopsis at the start of the help? :-) I guess I can put the SHA1 identifier of the first commit in my branch too? Anyway, I'll go and try it and see what happens.