On Tue, 30 Jun 2009, Malcolm J. Currie wrote:
>> % git reset --hard 131f1308b
>> % git pull
>
> After this some of the w/e changes are present twice, some off in a branch
> line in the gitk graphic.
>
Is that with gitk -all? They should not appear in a default gitk view.
Yes, they appear on a branch because Mark's branch point was much earlier
than the commit I sent round for the reset. The difference is that those
local commits you have should be just a local branch and won't be pushed
to JAC unless you decide to merge them into master (which you won't be
doing).
--
Tim Jenness
JAC software
http://www.jach.hawaii.edu/~timj
|