[vtk-developers] Stupid git question #1

[Francois Bertel]

It is easier to picture what happen by reading the diagrams on this
page (thanks Brad King for the reference):

http://marklodato.github.com/visual-git-guide/

On Tue, Apr 27, 2010 at 4:08 PM, David E DeMarle
<dave.demarle at kitware.com> wrote:
> no confusion, checkout will restore a file from the repository.
>
> [kargad:devel/ParaView/VTK] demarle% fif "*.txt" Lorensen
> ./Copyright.txt:Copyright (c) 1993-2008 Ken Martin, Will Schroeder,
> Bill Lorensen
> ./Copyright.txt: * Neither name of Ken Martin, Will Schroeder, or Bill
> Lorensen nor the names
> ./Utilities/Doxygen/authors.txt:lorensen: Lorensen, Bill (lorensen at crd.ge.com)
> ./Utilities/EncodeString/CMakeLists.txt:# Copyright (c) Ken Martin,
> Will Schroeder, Bill Lorensen
> ./Utilities/HashSource/CMakeLists.txt:# Copyright (c) Ken Martin, Will
> Schroeder, Bill Lorensen
> ./Utilities/ParseOGLExt/CMakeLists.txt:# Copyright (c) Ken Martin,
> Will Schroeder, Bill Lorensen
> [kargad:devel/ParaView/VTK] demarle% rm Copyright.txt
> [kargad:devel/ParaView/VTK] demarle% rm Utilities/Doxygen/authors.txt
> [kargad:devel/ParaView/VTK] demarle% rm Utilities/EncodeString/CMakeLists.txt
> [kargad:devel/ParaView/VTK] demarle% rm Utilities/HashSource/CMakeLists.txt
> [kargad:devel/ParaView/VTK] demarle% rm Utilities/ParseOGLExt/CMakeLists.txt
> [kargad:devel/ParaView/VTK] demarle% fif "*.txt" Lorensen
> [kargad:devel/ParaView/VTK] demarle% git checkout Copyright.txt
> [kargad:devel/ParaView/VTK] demarle% fif "*.txt" Lorensen
> ./Copyright.txt:Copyright (c) 1993-2008 Ken Martin, Will Schroeder,
> Bill Lorensen
> ./Copyright.txt: * Neither name of Ken Martin, Will Schroeder, or Bill
> Lorensen nor the names
>
> David E DeMarle
> Kitware, Inc.
> R&D Engineer
> 28 Corporate Drive
> Clifton Park, NY 12065-8662
> Phone: 518-371-3971 x109
>
>
>
> On Tue, Apr 27, 2010 at 3:56 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>> I'm not using the correct terminology I think.
>>
>> I have cloned a repository.
>> By accident I changed or deleted a file.
>> How do I get a copy of that file from the cloned repository?
>>
>> Bill
>>
>> On Tue, Apr 27, 2010 at 3:49 PM, David E DeMarle
>> <dave.demarle at kitware.com> wrote:
>>> git checkout path/to/file
>>>
>>> David E DeMarle
>>> Kitware, Inc.
>>> R&D Engineer
>>> 28 Corporate Drive
>>> Clifton Park, NY 12065-8662
>>> Phone: 518-371-3971 x109
>>>
>>>
>>>
>>> On Tue, Apr 27, 2010 at 3:42 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>>>> If I accidentally  delete or modify  a file in my local repository,
>>>> how can I undelete it. I want the equivalent of
>>>> cvs update -C
>>>>
>>>> Bill
>>>> _______________________________________________
>>>> Powered by www.kitware.com
>>>>
>>>> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>>>>
>>>> Follow this link to subscribe/unsubscribe:
>>>> http://www.vtk.org/mailman/listinfo/vtk-developers
>>>>
>>>>
>>>
>>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>
> Follow this link to subscribe/unsubscribe:
> http://www.vtk.org/mailman/listinfo/vtk-developers
>
>



-- 
François Bertel, PhD  | Kitware Inc. Suite 204
1 (518) 371 3971 x113 | 28 Corporate Drive
                      | Clifton Park NY 12065, USA