microblaze: Merge window + git - Kernel

This is a discussion on microblaze: Merge window + git - Kernel ; Hi everybody, Can you tell me when is open next merge window? and my next question is about GIT. I have second release at my git server and I have some changes which you reported. I would like to collect ...

+ Reply to Thread
Results 1 to 5 of 5

Thread: microblaze: Merge window + git

  1. microblaze: Merge window + git

    Hi everybody,

    Can you tell me when is open next merge window?

    and my next question is about GIT.

    I have second release at my git server and I have some changes which you
    reported. I would like to collect all changes in the same set of patches.

    I mean I have patch with 4 files and I did next changes. I would like to
    integrate these changes to the same patches. Is it possible to do it?
    It is easier to review all changes together.

    I think it is no good way to send first release with reported bugs and new diffs.

    Thanks,
    Michal Simek
    www.monstr.eu


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: microblaze: Merge window + git

    Michal Simek wrote:
    > Can you tell me when is open next merge window?


    When 2.6.25 is being released.

    > and my next question is about GIT.
    >
    > I have second release at my git server and I have some changes which you
    > reported. I would like to collect all changes in the same set of patches.
    >
    > I mean I have patch with 4 files and I did next changes. I would like to
    > integrate these changes to the same patches. Is it possible to do it?
    > It is easier to review all changes together.
    >
    > I think it is no good way to send first release with reported bugs and new diffs.


    You can combine several commits into one in a few ways. Of course the
    combined commit is an entirely new one (with its own SHA1 etc.). One
    possible way:

    # you are at
    $ git cherry-pick --no-commit # apply but don't commit yet
    $ git cherry-pick --edit # apply, edit the changelog, commit

    There will now be a whose parent is .
    incorporates changes of and .

    Another way:

    # you are at
    $ patch < ~/diff-from-somewhere
    $ git commit --amend # replace by new amended commit

    There will now be a instead of , with the same
    parent(s) which had. incorporates changes of
    and the diff.

    However, I am no expert on doing these things in git since I only
    develop with quilt. I use git only to publish the state of development
    and the state for upstream merge.
    --
    Stefan Richter
    -=====-==--- -=-- -=-==
    http://arcgraph.de/sr/
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. Re: microblaze: Merge window + git

    On Fri, 11 Apr 2008, Stefan Richter wrote:

    > Michal Simek wrote:
    > > Can you tell me when is open next merge window?

    >
    > When 2.6.25 is being released.
    >
    > > and my next question is about GIT.
    > >
    > > I have second release at my git server and I have some changes which you
    > > reported. I would like to collect all changes in the same set of patches.
    > >
    > > I mean I have patch with 4 files and I did next changes. I would like to
    > > integrate these changes to the same patches. Is it possible to do it?
    > > It is easier to review all changes together.
    > >
    > > I think it is no good way to send first release with reported bugs and new diffs.

    >
    > You can combine several commits into one in a few ways. Of course the
    > combined commit is an entirely new one (with its own SHA1 etc.). One
    > possible way:
    >
    > # you are at
    > $ git cherry-pick --no-commit # apply but don't commit yet
    > $ git cherry-pick --edit # apply, edit the changelog, commit
    >
    > There will now be a whose parent is .
    > incorporates changes of and .
    >
    > Another way:
    >
    > # you are at
    > $ patch < ~/diff-from-somewhere
    > $ git commit --amend # replace by new amended commit
    >
    > There will now be a instead of , with the same
    > parent(s) which had. incorporates changes of
    > and the diff.


    If you have a tree which has those four commits on top, it's rather easy
    with git:

    $ git-reset --soft HEAD^^^
    $ git-commit --amend

    ....In order the git-reset --soft to leave the index into the desired
    state, no pending stuff should be in index before beginning (index
    is the thing controlled with cmds like git-add/git-update-index/etc.).

    ....The commit's message is taken from the bottommost of those four
    original commits.

    --
    i.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  4. Re: microblaze: Merge window + git

    Stefan Richter wrote:
    > Michal Simek wrote:
    >> Can you tell me when is open next merge window?

    >
    > When 2.6.25 is being released.
    >


    .... which is expected to be within the week, so you're quite in luck.

    -hpa
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  5. Re: microblaze: Merge window + git

    Thanks for your answers,

    I integrate all reported bugs and I sent request to Microblaze community
    to review. I will clean patches to compact pack for your review.

    Regards,
    Michal Simek
    www.monstr.eu

    > Stefan Richter wrote:
    >> Michal Simek wrote:
    >>> Can you tell me when is open next merge window?

    >>
    >> When 2.6.25 is being released.
    >>

    >
    > ... which is expected to be within the week, so you're quite in luck.
    >
    > -hpa
    >

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread