[LRUG] git question

[Taryn East]

2009/8/20 Chris Mear <chrismear at gmail.com>

> On 20 Aug 2009, at 12:20, Taryn East wrote:
>
>> Ok, so now I'm guessing that part of the issue is that I did:
>> commit, commit,commit,commit... rebase...
>> then created *several* patches - the first of which only used the first
>> commit... ie didn't include the rebase.
>>
> No, I think this is a red herring. There's no sense in which you can
> 'include the rebase' in a patch -- doing a rebase is like a global operation
> that actually rewrites your commits, and that's it. It doesn't add a new
> node in the commit history in the same way that a merge commit does.
>
> My general pattern of working is: commit, commit, commit, pull and rebase
> every now and again (to make sure I'm not getting too out of line with
> what's going on upstream), commit, commit... and when I'm ready to release,
> pull-rebase-patch. That should be sufficient.


ok - cool. I think I'm slowly being enlightened here ;)
Eventually I'll get to the spot where I understand what I did and what I
should have done etc ;)

Thanks,
Taryn
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lrug.org/pipermail/chat-lrug.org/attachments/20090820/d625613d/attachment.html>