[sane-devel] git merge question
hakon at alstadheim.priv.no
Tue Dec 14 14:05:43 UTC 2010
Looks like you have run into some trouble on your schedule. :-) I just
want to tell you I am cheering you on. I have a LiDE 110 scanner and
sane-backends compiled from git (gentoo with gentoo-china overlay), so
if you have a patch you want to test, I would be happy to help :-).
The easiest for me will of course be to test from the repository, but I
can easily do a local patch as well.
Cheers, and a virtual beer from me.
Den 09. des. 2010 21:10, skrev stef:
> Le Thursday 09 December 2010 12:13:41 Julien BLACHE, vous avez écrit :
>> stef<stef.dev at free.fr> wrote:
>>> 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
>> 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.
> I'll dig into rebase -i .
> sane-devel mailing list: sane-devel at lists.alioth.debian.org
> Unsubscribe: Send mail with subject "unsubscribe your_password"
> to sane-devel-request at lists.alioth.debian.org
Håkon Alstadheim / N-7510 Skatval / email:hakon at alstadheim.priv.no
tlf: 74 82 60 27 mob: 47 35 39 38
spamtrap: finnesikke at alstadheim.priv.no -- 1 hit& you are out
More information about the sane-devel