<glossterm>Add</glossterm>\r
<glossdef>\r
<para>\r
- A Subversion command that is used to add a\r
+ A Git command that is used to add a\r
file or directory to your working copy.\r
The new items are added to the repository when you commit.\r
</para>\r
development line so as to develop a new feature without rendering\r
the main line unstable. Or you can branch a stable release to which\r
you make only bug fixes, while new developments take place on the\r
- unstable trunk. In Subversion a branch is implemented as a\r
+ unstable trunk. In Git a branch is implemented as a\r
<quote>cheap copy</quote>.\r
</para>\r
</glossdef>\r
<glossterm>Checkout</glossterm>\r
<glossdef>\r
<para>\r
- A Subversion command which creates a local working copy in an empty\r
+ A Git command which creates a local working copy in an empty\r
directory by downloading versioned files from the repository.\r
</para>\r
</glossdef>\r
<glossterm>Cleanup</glossterm>\r
<glossdef>\r
<para>\r
- To quote from the Subversion book:\r
+ To quote from the Git book:\r
<quote>\r
Recursively clean up the working copy, removing locks and resuming\r
unfinished operations. If you ever get a\r
<glossterm>Commit</glossterm>\r
<glossdef>\r
<para>\r
- This Subversion command is used to pass the changes in your local\r
+ This Git command is used to pass the changes in your local\r
working copy back into the repository, creating a new repository\r
revision.\r
</para>\r
<para>\r
When changes from the repository are merged with local changes, \r
sometimes those changes occur on the same lines. In this case\r
- Subversion cannot automatically decide which version to use and\r
+ Git cannot automatically decide which version to use and\r
the file is said to be in conflict. You have to edit the file manually\r
and resolve the conflict before you can commit any further changes.\r
</para>\r
<glossterm>Copy</glossterm>\r
<glossdef>\r
<para>\r
- In a Subversion repository you can create a copy of a single file\r
+ In a Git repository you can create a copy of a single file\r
or an entire tree. These are implemented as <quote>cheap copies</quote>\r
which act a bit like a link to the original in that they take up\r
almost no space. Making a copy preserves the history of the item\r
<glossterm>FSFS</glossterm>\r
<glossdef>\r
<para>\r
- A proprietary Subversion filesystem backend for repositories.\r
+ A proprietary Git filesystem backend for repositories.\r
Can be used on network shares. Default for 1.2 and newer repositories.\r
</para>\r
</glossdef>\r
<glossterm>Import</glossterm>\r
<glossdef>\r
<para>\r
- Subversion command to import an entire folder hierarchy into the repository\r
+ Git command to import an entire folder hierarchy into the repository\r
in a single revision.\r
</para>\r
</glossdef>\r
<glossdef>\r
<para>\r
If a working copy has changes to text files only, it is possible\r
- to use Subversion's Diff command to generate a single file summary\r
+ to use Git's Diff command to generate a single file summary\r
of those changes in Unified Diff format. A file of this type is often\r
referred to as a <quote>Patch</quote>, and it can be emailed to someone\r
else (or to a mailing list) and applied to another working copy.\r
<glossterm>Property</glossterm>\r
<glossdef>\r
<para>\r
- In addition to versioning your directories and files, Subversion allows\r
+ In addition to versioning your directories and files, Git allows\r
you to add versioned metadata - referred to as <quote>properties</quote>\r
to each of your versioned directories and files. Each property has a\r
- name and a value, rather like a registry key. Subversion has some\r
+ name and a value, rather like a registry key. Git has some\r
special properties which it uses internally, such as\r
<literal>svn:eol-style</literal>. TortoiseGit has some too, such as\r
<literal>tsvn:logminsize</literal>. You can add your own properties\r
<glossterm>Revert</glossterm>\r
<glossdef>\r
<para>\r
- Subversion keeps a local <quote>pristine</quote> copy of each file as\r
+ Git keeps a local <quote>pristine</quote> copy of each file as\r
it was when you last updated your working copy. If you have made changes\r
and decide you want to undo them, you can use the <quote>revert</quote>\r
command to go back to the pristine copy.\r
<glossterm>SVN</glossterm>\r
<glossdef>\r
<para>\r
- A frequently-used abbreviation for Subversion.\r
+ A frequently-used abbreviation for Git.\r
</para>\r
<para>\r
- The name of the Subversion custom protocol used by the\r
+ The name of the Git custom protocol used by the\r
<quote>svnserve</quote> repository server.\r
</para>\r
</glossdef>\r
<glossterm>Update</glossterm>\r
<glossdef>\r
<para>\r
- This Subversion command pulls down the latest changes from the\r
+ This Git command pulls down the latest changes from the\r
repository into your working copy, merging any changes made by\r
others with local changes in the working copy.\r
</para>\r
OSDN Git Service
