[vtk-developers] git stupid question #4
bouzim at gmail.com
Fri Apr 30 10:39:05 EDT 2010
On 2010/4/30 Biddiscombe, John A. wrote:
> Denis, Mark
> Thanks to both of you for the tips and tricks
>> You do not have to switch to master, simply run
>> git pull kitware master
>> from your cscs-pv branch.
> OK. That was a disaster. it did an auto merge onto the cscs-pv branch and screwed up everything with conflicts.
> did you mean
> git "fetch" kitware master
No, my point was that this single git command is equivalent to yours
but does not modify timestamps of unmodified files, this is exactly
what you were asking for.
Disclaimer: I never worked with submodules, but I doubt that this
makes a difference here.
> if so, then fine. I am rapidly learning stuff and have everything stable now. It's nice the way you can trash a branch, reset it, re check it out and pull from anywhere.
AFAICT gitk has not been mentioned yet, this graphical tool helps a
lot when you have to make such changes.
More information about the vtk-developers