[sr-dev] how to fast forward?

[Andrei Pelinescu-Onciul]

On Jan 27, 2010 at 22:00, Juha Heinanen <jh at tutpro.com> wrote:
> Andrei Pelinescu-Onciul writes:
> 
>  > > how can i do this 'fast-forwarding' without pulling again in this
>  > > branch?
>  > 
>  > With basic git: 
>  > git checkout kamailio_3.0; git  pull --rebase origin kamailio_3.0
>  > (in this case if you get the fast forward message --rebase is not really
>  > needed, but OTOH it does nut hurt and it's safer to always use it).
> 
> andrei,
> 
> the above again requires network access.  i would imagine that since git
> knows that i have already done pull at some branch, i could somehow be
> able to fast forward the other branches without a need for a new pull at
> each branch.

git rebase origin/kamailio_3.0   # will also rebase possible local
                                 # commits
or

git merge --ff origin/kamailio_3.0  # works only for fast forward
                                    # (there are no local commits)

If you want only to compile, you can also checkout directly
origin/kamailio_3.0, e.g. git checkout origin/kamailio_3.0. You want be
able to commit though (think of it as a kind of read-only access).


Andrei