[Scummvm-devel] Merged branch-1-3-0 into master

[Tarek Soliman]

On Wed, Jun 01, 2011 at 06:38:32PM +0200, Marcus Comstedt wrote:
> 
> Max Horn <max at quendi.de> writes:
> 
> [...]
> > While I am at it: What I would have disliked about manually cherry picking from the release branch to stable:
> > (a) I would have to find all relevant commits manually (not *that* much work with git, but still considerably more work than what I had to invest now). 
> > (b) Since I would have transplanted commits of people, taking them out of context, there is a fair likelihood for messing something up (esp. for a multi-commit series). E.g. if I forgot one of five commmits, then this is not visible in the history; but "git blame" would lead to the original author. 
> 
> Yes, as mentioned in the other thread, rebase -i provides a better
> interface here, since it lists all unmerged commits, and allows you to
> remove those you don't want, and rearrange or even combine related
> commits, without the risk of forgetting some commit.

That only works well if either of the following is true for each of the commits being rebased:
- you are familiar with the commit
- the commit clearly state what should be done on the first line on the commit msg
-- 
Tarek