On Tue, 29 Apr 2008 22:10:41 -0700, Russ Allbery <[EMAIL PROTECTED]> said:
> Manoj Srivastava <[EMAIL PROTECTED]> writes:
>> The following patch, from branch bug458910-rra, looks good to me.
> That's two seconds, so I should merge it. Is there some way that I
> can include the Acked-by information in a merge when I do the merge?
> Hm, actually, I'm guessing probably not, since that would involve
> changing the commit, which defeats the whole point of the merge.
You can create a whole new commit, perhaps by adding a ChangeLog
entry or something, and add the Acked-By: lines to the commit
message.
> So... should I just merge this branch (git merge bug458910-rra),
> rather than doing anything fancy with squash or rebase or anything?
> This would be my preference; I think it's simpler and easier. But I
> want to double-check before just going ahead.
I think we should not squish or rebase. gitk --all looks clean
enough.
manoj
--
Real programmers can write assembly code in any language. :-) Larry
Wall in <[EMAIL PROTECTED]>
Manoj Srivastava <[EMAIL PROTECTED]> <http://www.debian.org/~srivasta/>
1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
