[sane-devel] git merge question

[stef]

Le Thursday 09 December 2010 12:13:41 Julien BLACHE, vous avez écrit :
> stef <stef.dev at free.fr> wrote:
> 
> Hi,
> 
> > 	I have finished adding support for the LiDE 110 on a branch. If I merge
> > 
> > this branch on master, all the commit history will be preserved and sent
> > to the sane-commit mailing list. Is it OK to do like this, or do we
> > prefer to have one big commit ? In this case how to achieve this with
> > git ?
> 
> It all depends on the content of your branch. If your X commits are all
> features, then leave them as is. If they are partly fixes for previous
> commits in the same branch, you have the option to squash some commits
> together.
> 
> See man git-rebase (you'll want -i).
> 
> Also, pleaser consider rebasing your branch on top of master, then
> pulling that into master (that'll be a fast-forward, not a merge) and
> pushing that out. Merge commits are a pain in the *ss when bisecting, so
> avoid them as much as possible.
> 
> JB.

	Thanks,

	I'll dig into rebase -i .

Regards,
	Stef