[Paraview-developers] git question

[Kyle Lutz]

On Mon, Apr 29, 2013 at 1:52 PM, burlen <burlen.loring at gmail.com> wrote:
> Hi all,
>
> In a PV branch that needs a VTK branch (not in the repo) how does one sync
> up with the PV development head? In PV I do
>
> git fetch origin
> git rebase origin/master
> git submodule update
>
> That rebas's my PV changes but now VTK is no longer on my branch. What's the
> best way to rebase that VTK branch back to the point where PV is at? I've
> been creating a new branch and git am but this is quite tedious, is there a
> better way?

I usually just do:

cd VTK
git fetch pvvtk # just to ensure it's up to date
git rebase pvvtk/pv-master

-kyle