which brings up the following dialog box:\r
<figure id="tsvn-dug-checkout-dia-1">\r
<title>The Checkout dialog</title>\r
- <graphic fileref="../images/Checkout.png"/>\r
+ <graphic fileref="../images/SwitchCheckOut.png"/>\r
</figure>\r
- If you enter a branch name, new branch created and switch to new branchs.\r
+ If you enter a branch name at <guilabel>Create New Branch</guilabel>, new branch created and switch to new branchs.\r
</para>\r
<!--\r
<sect2 id="tsvn-dug-checkout-depth">\r
-->\r
<important>\r
<para>\r
- If <guilabel>Omit externals</guilabel> is checked, or if you wish\r
- to increase the depth value, you will have to perform\r
- updates to your working copy using\r
- <menuchoice>\r
- <guimenu>TortoiseGit</guimenu>\r
- <guimenuitem>Update to Revision...</guimenuitem>\r
- </menuchoice>\r
- instead of\r
- <menuchoice>\r
- <guimenu>TortoiseGit</guimenu>\r
- <guimenuitem>Update</guimenuitem>\r
- </menuchoice>.\r
- The standard update will include all externals and keep the existing depth.\r
+ If you checkout\switch to <guilabel>Tags</guilabel> or <guilabel>Version</guilabel>\r
+ Prefer you create new branch for it, otherwise you will work at "no branch".\r
</para>\r
</important>\r
- <para>\r
- It is recommended that you check out only the <literal>trunk</literal> part of the\r
- directory tree, or lower. If you specify the parent path of the\r
- directory tree in the URL then you might end up with a full\r
- hard disk since you will get a copy of the entire repository tree\r
- including every branch and tag of your project!\r
- </para>\r
+ \r
<tip>\r
<title>Exporting</title>\r
<para>\r
Sometimes you may want to create a local copy without any of those\r
- <filename>.svn</filename> directories, e.g. to create a zipped\r
+ <filename>.git</filename> directories, e.g. to create a zipped\r
tarball of your source.\r
Read <xref linkend="tsvn-dug-export"/> to find out how to do that.\r
</para>\r
just check that file to add it to the commit.\r
</para>\r
<para>\r
+ Default commit dialog just list select paths and their child directory files. \r
+ If you want to list all files of project, you can just click <guilabel>\r
+ Whole Project</guilabel>\r
+ </para>\r
+ <!--\r
+ <para>\r
Items which have been switched to a different repository path are\r
also indicated using an <literal>(s)</literal> marker. You may have\r
switched something while working on a branch and forgotten to switch\r
back to trunk. This is your warning sign!\r
</para>\r
+ -->\r
<!--\r
<tip>\r
<title>Commit files or folders?</title>\r
many unversioned (e.g. compiler generated or editor backup)\r
files, there are several ways to handle this. You can:\r
<itemizedlist>\r
+ <!--\r
<listitem>\r
<para>\r
add the file (or a wildcard extension)\r
This will affect every working copy you have.\r
</para>\r
</listitem>\r
+ -->\r
<listitem>\r
<para>\r
- add the file to the <literal>svn:ignore</literal> list\r
+ add the file to the <literal>git:ignore</literal> list\r
using\r
<menuchoice>\r
<guimenu>TortoiseGit</guimenu>\r
customizations are preserved, so you will see the same headings\r
next time.\r
</para>\r
+ <!--\r
<para>\r
By default when you commit changes, any locks that you hold on files\r
are released automatically after the commit succeeds. If you want\r
configuration file. Read <xref linkend="tsvn-dug-settings-main"/>\r
for information on how to edit the Git configuration file.\r
</para>\r
+ -->\r
<tip>\r
<title>Drag and Drop</title>\r
+ <!--\r
<para>\r
You can drag files into the commit dialog from elsewhere, so\r
long as the working copies are checked out from the same repository.\r
</para>\r
<para>\r
You can drag unversioned files which reside within a working copy\r
- into the commit dialog, and they will be SVN added automatically.\r
+ into the commit dialog, and they will be Git added automatically.\r
</para>\r
+ -->\r
</tip>\r
<!--\r
<tip>\r
</tip>\r
-->\r
</sect2>\r
+ <!--\r
<sect2 id="tsvn-dug-commit-changelists">\r
<title>Change Lists</title>\r
<para>\r
in <xref linkend="tsvn-dug-changelists"/>.\r
</para>\r
</sect2>\r
+ -->\r
+ <!--\r
<sect2 id="tsvn-dug-commit-ignore">\r
<title>Excluding Items from the Commit List</title>\r
<para>\r
in the commit dialog.\r
</para>\r
</sect2>\r
+ -->\r
<sect2 id="tsvn-dug-commit-log">\r
<title>Commit Log Messages</title>\r
<para>\r
</para>\r
-->\r
<para>\r
+ You can add your name and email address to end of log message by click <guilabel>\r
+ Sign</guilabel>\r
+ </para>\r
+ <!--\r
+ <para>\r
You can clear all stored commit messages from the <guilabel>Saved data</guilabel>\r
page of TortoiseGit's settings, or you can clear individual messages from\r
within the <guilabel>Recent messages</guilabel> dialog using the\r
<keycap>Delete</keycap> key.\r
</para>\r
+ -->\r
<para>\r
If you want to include the checked paths in your log message, you can use\r
the command\r
code merged from repository\r
>>>>>>> revision\r
</screen>\r
+<!--\r
Also, for every conflicted file Git places three\r
additional files in your directory:\r
<variablelist>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
+-->\r
</para>\r
<para>\r
- You can either launch an external merge tool / conflict\r
+ You can launch an external merge tool / conflict\r
editor with\r
<menuchoice>\r
<guimenu>TortoiseGit</guimenu>\r
</menuchoice>\r
and commit your modifications to the repository.\r
Please note that the Resolve command does not really\r
- resolve the conflict. It just removes the\r
+ resolve the conflict. \r
+ <!--\r
+ It just removes the\r
<filename>filename.ext.mine</filename> and\r
<filename>filename.ext.r*</filename> files,\r
+ -->\r
+ I use "git add" to mark file status as resolved\r
to allow you to commit your changes.\r
</para>\r
<para>\r
</para>\r
<para>\r
<graphic fileref="../images/ReadOnlyIcon.png"/> \r
- If you have set the <literal>svn:needs-lock</literal> property on a file,\r
- Git makes that file read-only until you get a lock on that file.\r
- Such files have this overlay to indicate that you have to get a lock\r
- first before you can edit that file.\r
+ Staged. If you use "git update-index" to tell git this file will be commited,\r
+ Git makes that file staged.\r
</para>\r
+ <!--\r
<para>\r
<graphic fileref="../images/LockedIcon.png"/> \r
If you hold a lock on a file, and the Git status is\r
should release the lock if you are not using it to allow others to\r
commit their changes to the file.\r
</para>\r
+ -->\r
<para>\r
<graphic fileref="../images/DeletedIcon.png"/> \r
This icon shows you that some files or folders inside the current folder\r
</para>\r
<para>\r
Now that there are more Tortoise clients around (TortoiseCVS, TortoiseHG, ...)\r
- the icon limit becomes a real problem. To work around this, the TortoiseGit\r
+ the icon limit becomes a real problem. To work around this, the TortoiseSVN\r
project introduced a common shared icon set, loaded as a DLL, which can be\r
used by all Tortoise clients. Check with your client provider to see if\r
this has been integrated yet :-)\r
<guimenuitem>More...</guimenuitem> from the context menu displayed. A\r
dialog will appear where you can specify the columns and their\r
order, which is displayed in the <quote>Detailed View</quote>. Scroll down\r
- until the entries starting with SVN come into view. Check the\r
+ until the entries starting with Git come into view. Check the\r
ones you would like to have displayed and close the dialog by\r
pressing <guibutton>OK</guibutton>. The columns will be appended\r
to the right of those currently displayed. You can reorder them by\r
</sect2>\r
<sect2 id="tsvn-dug-wcstatus-2">\r
<?dbhh topicname="HIDD_CHANGEDFILES"?>\r
- <title>Local and Remote Status</title>\r
+ <title>Status</title>\r
<indexterm>\r
<primary>status</primary>\r
</indexterm>\r
way in your working copy, as well as any unversioned files\r
you may have.\r
</para>\r
+ <!--\r
<para>\r
If you click on the\r
<guibutton>Check Repository</guibutton> then you can also\r
have to hold down the <keycap>Shift</keycap> key when you \r
click on the <guibutton>Check Repository</guibutton> button.\r
</para>\r
+ -->\r
<para>\r
The dialog uses colour coding to highlight the status.\r
<variablelist>\r
customizations are preserved, so you will see the same headings\r
next time.\r
</para>\r
+ <!--\r
<para>\r
If you are working on several unrelated tasks at once, you can also\r
group files together into changelists.\r
Read <xref linkend="tsvn-dug-commit-changelists"/> for more information.\r
</para>\r
+ -->\r
<para>\r
At the bottom of the dialog you can see a summary of the range of repository\r
revisions in use in your working copy. These are the <emphasis>commit</emphasis>\r
all files in your working copy.\r
</para>\r
</tip>\r
+ <!--\r
<tip>\r
<title>Repairing External Renames</title>\r
<para>\r
to pair the two files as a rename.\r
</para>\r
</tip>\r
+ -->\r
</sect2>\r
<sect2 id="tsvn-dug-diffing">\r
<title>Viewing Diffs</title>\r
OSDN Git Service
