Wolfgang Denk <[EMAIL PROTECTED]> writes:
> external diff died, stopping at common/cmd_nand.c.
> Some commits could not be rebased, check by hand:
> 67a002cbe2b2850d76d797e679bc290a7df6
>
> OK, I can edit the file to resolve the conflicts. But what do I do
> then to contin
Hello,
in message <[EMAIL PROTECTED]> you wrote:
>
> This is the kind of situation I used to have all the time when
> Linus was the maintainer and I was a contributor, when you look
> at "master" branch being the "maintainer" branch, and "pu"
> branch being the "contributor" branch. Your work st
There are other ways to do these, explained in this thread. I will
only show the StGIT way, just choose which one suits you better.
Steve French <[EMAIL PROTECTED]> wrote:
> 1) There is no way to send a particular changeset from the "middle"
> of a set from one tree to another, without exporting i
Junio C Hamano <[EMAIL PROTECTED]> wrote:
> Petr Baudis <[EMAIL PROTECTED]> writes:
>
>> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
>> where Junio C Hamano <[EMAIL PROTECTED]> told me that...
>>> Linus Torvalds <[EMAIL PROTECTED]> writes:
>>>
>>> > Junio, maybe you want to
On Sun, Aug 14, 2005 at 12:02:33AM -0400, Ryan Anderson wrote:
> On Sat, Aug 13, 2005 at 10:35:50PM -0500, Steve French wrote:
>
> > 2) There is no way to update the comment field of a changeset after it
> > goes in (e.g. to add a bugzilla bug number for a bug that was opened
> > just after the f
Petr Baudis <[EMAIL PROTECTED]> writes:
> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
> where Junio C Hamano <[EMAIL PROTECTED]> told me that...
>> Linus Torvalds <[EMAIL PROTECTED]> writes:
>>
>> > Junio, maybe you want to talk about how you move patches from your "pu"
>
Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
where Junio C Hamano <[EMAIL PROTECTED]> told me that...
> Linus Torvalds <[EMAIL PROTECTED]> writes:
> > Alternatively, use "git cherry", which helps re-order the commits in your
> > tree. They'll be _new_ commits, but they'll hav
Linus Torvalds <[EMAIL PROTECTED]> writes:
>> If I export those two changesets as patches, and send them on.
>> presumably I lose the changset comments etc.
>
> Well, you can export them with "git send-email" and you won't be losing
> any comments.
Yes, except the command is "git format-patch".
On Sat, 13 Aug 2005, Linus Torvalds wrote:
> That's correct. Same things apply: you can move a patch over, and create a
> new one with a modified comment, but basically the _old_ commit will be
> immutable.
Let me clarify.
You can entirely _drop_ old branches, so commits may be immutable, bu
On Sat, 13 Aug 2005, Steve French wrote:
>
> 1) There is no way to send a particular changeset from the "middle" of a
> set from one tree to another, without exporting it as a patch or
> rebuilding a new git tree.
Correct.
> If I export those two changesets as patches, and send them on.
> pr
On Sat, Aug 13, 2005 at 10:35:50PM -0500, Steve French wrote:
> Just to confirm a recent answer to questions on lkml ...
>
> 1) There is no way to send a particular changeset from the "middle" of a
> set from one tree to another, without exporting it as a patch or
> rebuilding a new git tree.
Just to confirm a recent answer to questions on lkml ...
1) There is no way to send a particular changeset from the "middle" of a
set from one tree to another, without exporting it as a patch or
rebuilding a new git tree. I have two changesets that, after testing
last week, I now consider mo
12 matches
Mail list logo
