On 2009-01-13, Matthieu Moy <Matthieu.Moy@xxxxxxx> wrote:
> Sitaram Chamarty <sitaramc@xxxxxxxxx> writes:
>
>> I like using "git rebase -i HEAD~5" (if I want to rebase the
>> last 5 commits). In the editor that pops up, I reorder the
>> ones that I know should be together, and on each set to be
>> squashed, I change the "pick" to "s" (for squash) on all but
>> the first one. Save the file and it's all done.
>
> And right after, you probably want to do stg like
>
> git diff master@{1} master
>
> to see whether you actually changed the result by reordering your
> patches.
I used to do that, but now I've stopped. If it doesn't
conflict, I know it's good. I go straight to the equivalent
of make && make test.
I must mention though, that I don't reorder the relative
sequences of commits affecting the same file/set of files.
That might have something to do with my confidence :-)
--
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
