threads / discuss / 7156

Re: StGIT 0.12.1: pulling up to specific commit (tag)

Subject: Re: StGIT 0.12.1: pulling up to specific commit (tag)

## tl;dr

2 messages between Mar 8, 2007 and Mar 17, 2007.

replies: 1people: 2as markdown or json

Yann Dirson· Mar 8, 2007, 20:17 UTC · lore

Hi Andrey,

>Now "stg pull" no more accepts branch name; but I cannot figure how to to the 
>same using git config.

(I must say I am not sure to understand the workflow you're using, I suspect there were some missing steps in your mail).

You probably want "stg rebase <parent branch>", unless you have commits below your stack base, and that you get a merge commit when running "git pull".

In the latter case, there is possibly a missing feature: you can get a merge through git-pull, but you cannot pass the refspec any more. If there is a use for this (other than the one already handled by "rebase"), I'd like to understand the need, so we can add the feature back in a better way.

Best regards,

-- 
Yann.

Andrey Borzenkov· Mar 17, 2007, 08:33 UTC · re: Yann Dirson · lore

On Thursday 08 March 2007, Yann Dirson wrote:

Show 12 quoted lines

> Hi Andrey,
>
> >Now "stg pull" no more accepts branch name; but I cannot figure how to to
> > the same using git config.
>
> (I must say I am not sure to understand the workflow you're using, I
> suspect there were some missing steps in your mail).
>
> You probably want "stg rebase <parent branch>", unless you have
> commits below your stack base, and that you get a merge commit when
> running "git pull".
>

yes, looks like stg rebase does exactly what I need. Thank you and sorry for stupid question.

-andrey