one half of a rebase

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

one half of a rebase

Geoffrey Irving
If I'm on branch topic and do "git rebase master", git performs two operations:

1. Rewind the current head to master.
2. For each commit in topic that isn't in master, cherry pick it onto
the current head.

I would like to be able to do (2) as a separate operation.  For
example, if I start out on branch master and want to get all of
topic's commits on top of the current head, I currently do

    git checkout topic
    git rebase master
    git branch -d master
    git branch -m master

If I could do (2) as a separate operation, it would look something like

    git cherry-pick-all topic

which is simpler and faster since it avoids switching files back and
forth (master to topic and back).  Is there a robust way to achieve
the cherry-pick-all semantics with current commands?  If not, how
difficult would it be to partition rebase accordingly?

Thanks,
Geoffrey
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: one half of a rebase

Matthieu Moy-2
Geoffrey Irving <[hidden email]> writes:

> If I could do (2) as a separate operation, it would look something like
>
>     git cherry-pick-all topic

I believe

  git rebase --onto master master topic
  git update-ref master topic

would do the trick.

--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: one half of a rebase

Alex Riesen
In reply to this post by Geoffrey Irving
On Fri, Sep 11, 2009 at 19:25, Geoffrey Irving <[hidden email]> wrote:
> If I could do (2) as a separate operation, it would look something like
>
>    git cherry-pick-all topic
>
> which is simpler and faster since it avoids switching files back and
> forth (master to topic and back).  Is there a robust way to achieve
> the cherry-pick-all semantics with current commands?  If not, how
> difficult would it be to partition rebase accordingly?

I have this in my .bashrc:

$ gcp3 ()
{
    git format-patch -k --stdout --full-index "$@" | git am -k -3 --binary
}

Then, while on master branch:

$ gcp3 master..topic
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: one half of a rebase

Geoffrey Irving
On Fri, Sep 11, 2009 at 5:10 PM, Alex Riesen<[hidden email]> wrote:

> On Fri, Sep 11, 2009 at 19:25, Geoffrey Irving <[hidden email]> wrote:
>> If I could do (2) as a separate operation, it would look something like
>>
>>    git cherry-pick-all topic
>>
>> which is simpler and faster since it avoids switching files back and
>> forth (master to topic and back).  Is there a robust way to achieve
>> the cherry-pick-all semantics with current commands?  If not, how
>> difficult would it be to partition rebase accordingly?
>
> I have this in my .bashrc:
>
> $ gcp3 ()
> {
>    git format-patch -k --stdout --full-index "$@" | git am -k -3 --binary
> }
>
> Then, while on master branch:
>
> $ gcp3 master..topic

Great!  That should work nicely.

Geoffrey
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: one half of a rebase

Paolo Bonzini-2
On 09/12/2009 04:23 AM, Geoffrey Irving wrote:

> On Fri, Sep 11, 2009 at 5:10 PM, Alex Riesen<[hidden email]>  wrote:
>> On Fri, Sep 11, 2009 at 19:25, Geoffrey Irving<[hidden email]>  wrote:
>>> If I could do (2) as a separate operation, it would look something like
>>>
>>>     git cherry-pick-all topic
>>>
>>> which is simpler and faster since it avoids switching files back and
>>> forth (master to topic and back).  Is there a robust way to achieve
>>> the cherry-pick-all semantics with current commands?  If not, how
>>> difficult would it be to partition rebase accordingly?

As mentioned by Alex "git am -3" is basically parsing + the second part
of rebase.  So, based on Alex's recipe, here is a possible alias for
cherry-pick-all:

[alias]
        cherry-pick-all = "!f() { git format-patch -k --stdout --full-index
`git symbolic-ref HEAD`..$1 | git am -k -3 --binary; }; f"

More useful (just because it is more generic) than "the second part of
git rebase", a "sequencer" would be "the second part of git rebase -i",
applying a custom script coming from stdin.  If that was present, git
cherry-pick-all could be done like this:

git log --pretty=tformat:'pick %h' master..topic | git sequencer

And here is yet another alternative, that however would only work only
if the patches applies perfectly:

git log --pretty=format:%h master..topic | xargs -rn1 git cherry-pick

Paolo
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html