Print

Print


On Thu, 10 Feb 2011, Malcolm J. Currie wrote:

>> Thanks Peter - that worked nicely for me.
>
> Yes thanks a handy recipe.  However, I regretted not using --rebase on the 
> git pull.  Now I have rejected non-fast-forward updates.
>

if you forgot a rebase you can always recover with

   git reset --hard HEAD^

(assuming you have no local mods) or some such and then you can do a "git 
pull --rebase" again.

-- 
Tim Jenness
JAC software
http://www.jach.hawaii.edu/~timj