Update diff del rename ignore document.

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_add.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_add.xml
index 80076f2..2b28753 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_add.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_add.xml
@@ -66,7 +66,7 @@
                                        select\r
                                        <menuchoice>\r
                                                <guimenu>Context Menu</guimenu>\r
-                                               <guimenuitem>SVN Add files to this WC</guimenuitem>\r
+                                               <guimenuitem>Git Add files to this WC</guimenuitem>\r
                                        </menuchoice>.\r
                                        The files will then be copied to the working copy and\r
                                        added to version control.\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml
index b32aa55..1a0dc3c 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_branchtag.xml
@@ -9,9 +9,6 @@
                <primary>tag</primary>\r
        </indexterm>\r
        <indexterm>\r
-               <primary>copy</primary>\r
-       </indexterm>\r
-       <indexterm>\r
                <primary>mark release</primary>\r
        </indexterm>\r
        <?dbhh topicname="HIDD_COPY"?>\r
@@ -23,7 +20,7 @@
                disturbing the main line of development with compiler\r
                errors and bugs. As soon as the new feature is stable enough\r
                then the development branch is <firstterm>merged</firstterm>\r
-               back into the main branch (trunk).\r
+               back into the main branch.\r
        </para>\r
        <para>\r
                Another feature of version control systems is the ability\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml
index 87ae8bf..1604147 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_diff.xml
@@ -38,6 +38,7 @@
                                        </para>\r
                                </listitem>\r
                        </varlistentry>\r
+      <!--\r
                        <varlistentry>\r
                                <term>Difference to another branch/tag</term>\r
                                <listitem>\r
@@ -63,6 +64,7 @@
                                        </para>\r
                                </listitem>\r
                        </varlistentry>\r
+      -->\r
                        <varlistentry>\r
                                <term>Difference from a previous revision</term>\r
                                <listitem>\r
@@ -139,6 +141,7 @@
                                        </para>\r
                                </listitem>\r
                        </varlistentry>\r
+      <!--\r
                        <varlistentry>\r
                                <term>Difference between WC file/folder and a URL</term>\r
                                <listitem>\r
@@ -159,6 +162,8 @@
                                        </para>\r
                                </listitem>\r
                        </varlistentry>\r
+      -->\r
+      <!--\r
                        <varlistentry>\r
                                <term>Difference with blame information</term>\r
                                <listitem>\r
@@ -170,6 +175,7 @@
                                        </para>\r
                                </listitem>\r
                        </varlistentry>\r
+      -->\r
                        <varlistentry>\r
                                <term>Difference between folders</term>\r
                                <listitem>\r
@@ -490,6 +496,10 @@
                                                        <citetitle>here</citetitle>\r
                                                </ulink>.\r
                                        </para>\r
+          <para>\r
+            Notepad2 have been included at TortoiseGit Setup MSI.\r
+            You can launch it by command line "notepad2". \r
+          </para>\r
                                </listitem>\r
                        </varlistentry>\r
                </variablelist>\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml
index 0f1e8b0..15b9dc3 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_ignore.xml
@@ -47,13 +47,14 @@
                        <guimenu>TortoiseGit</guimenu>\r
                        <guimenuitem>Remove from Ignore List</guimenuitem>\r
                </menuchoice>\r
-               You can also access a folder's <literal>svn:ignore</literal>\r
-               property directly. That allows you to specify more general\r
+               You can also access a folder's <literal>.gitignore</literal>\r
+               file directly. That allows you to specify more general\r
                patterns using filename globbing, described in the section below.\r
-               Read <xref linkend="tsvn-dug-propertypage"/> for more information\r
-               on setting properties directly. Please be aware that each ignore pattern \r
+               Read <xref linkend="gitignore(5)"/> for more information. \r
+    Please be aware that each ignore pattern \r
                has to be placed on a separate line. Separating them by spaces does not work.\r
        </para>\r
+  <!--\r
        <tip>\r
                <title>The Global Ignore List</title>\r
                <para>\r
@@ -68,6 +69,8 @@
                        <xref linkend="tsvn-dug-settings-main"/> for more information. \r
                </para>\r
        </tip>\r
+  -->\r
+  <!--\r
        <tip>\r
                <title>Ignoring Versioned Items</title>\r
                <para>\r
@@ -77,6 +80,7 @@
                        <quote>unversion</quote> it.\r
                </para>\r
        </tip>\r
+  -->\r
        <sect2 id="tsvn-dug-ignore-glob">\r
                <title>Pattern Matching in Ignore Lists</title>\r
                <indexterm>\r
@@ -132,6 +136,7 @@
                        regardless of case, you could use a pattern like\r
                        <literal>*.[Tt][Mm][Pp]</literal>.\r
                </para>\r
+    <!--\r
                <para>\r
                        If you want an official definition for globbing, you can find\r
                        it in the IEEE specifications for the shell command language\r
@@ -139,6 +144,7 @@
                                <citetitle>Pattern Matching Notation</citetitle>\r
                        </ulink>.\r
                </para>\r
+    \r
                <tip>\r
                        <title>No Paths in Global Ignore List</title>\r
                        <para>\r
@@ -156,5 +162,6 @@
                                reliable way to achieve this using global ignore patterns.\r
                        </para>\r
                </tip>\r
+    -->\r
        </sect2>\r
 </sect1>\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
index c5edc82..3c5aab6 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
@@ -546,7 +546,7 @@
                                                        files shown as <emphasis>modified</emphasis>.\r
                                                </para>\r
                                        </listitem>\r
-                               </varlistentry>\r
+                               </varlistentry> \r
                                <varlistentry>\r
                                        <term>Blame changes</term>\r
                                        <listitem>\r
@@ -558,6 +558,8 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+        -->\r
+       \r
                                <varlistentry>\r
                                        <term>Show as unified diff</term>\r
                                        <listitem>\r
@@ -568,7 +570,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
-                               -->\r
+                       \r
                                <varlistentry>\r
                                        <term>Open / Open with...</term>\r
                                        <listitem>\r
@@ -587,15 +589,89 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
-                               <!--\r
+                               \r
                                <varlistentry>\r
-                                       <term>Revert changes from this revision</term>\r
+                                       <term>Revert changes to this revision</term>\r
                                        <listitem>\r
                                                <para>\r
-                                                       Revert the changes made to the selected file in that revision.\r
+                                                       Revert chosen file to this revision.\r
                                                </para>\r
-                                       </listitem>\r
+                                       </listitem>          \r
                                </varlistentry>\r
+        <varlistentry>\r
+          <term>Save revision to...</term>\r
+          <listitem>\r
+            <para>\r
+              Save the selected revision to a file so you\r
+              have an older version of that file.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <varlistentry>\r
+          <term>Show log</term>\r
+          <listitem>\r
+            <para>\r
+              Show the revision log for the selected single file.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <varlistentry>\r
+          <term>Compare with base</term>\r
+          <listitem>\r
+            <para>\r
+              Compare chosen file with base version.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <varlistentry>\r
+          <term>Compare with working copy</term>\r
+          <listitem>\r
+            <para>\r
+              Compare chosen file with working copy.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <varlistentry>\r
+          <term>View revision in Notepad2</term>\r
+          <listitem>\r
+            <para>\r
+              Show chosen file with notepad2 with chosen commit.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <varlistentry>\r
+          <term>Explore to</term>\r
+          <listitem>\r
+            <para>\r
+              Open directory of file with Explore.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <varlistentry>\r
+          <term>Copy paths to clipboard</term>\r
+          <listitem>\r
+            <para>\r
+              Copy paths to clipboard\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <varlistentry>\r
+          <term>Copy all information to clipboard</term>\r
+          <listitem>\r
+            <para>\r
+              Copy all information to clipboard, include version info.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        \r
+        <!--\r
                                <varlistentry>\r
                                        <term>Show properties</term>\r
                                        <listitem>\r
@@ -606,14 +682,7 @@
                                </varlistentry>\r
                                -->\r
                                <!--\r
-                               <varlistentry>\r
-                                       <term>Show log</term>\r
-                                       <listitem>\r
-                                               <para>\r
-                                                       Show the revision log for the selected single file.\r
-                                               </para>\r
-                                       </listitem>\r
-                               </varlistentry>\r
+                       \r
                                <varlistentry>\r
                                        <term>Get merge logs</term>\r
                                        <listitem>\r
@@ -624,15 +693,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
-                               <varlistentry>\r
-                                       <term>Save revision to...</term>\r
-                                       <listitem>\r
-                                               <para>\r
-                                                       Save the selected revision to a file so you\r
-                                                       have an older version of that file.\r
-                                               </para>\r
-                                       </listitem>\r
-                               </varlistentry>\r
+                       \r
                                -->\r
                        </variablelist>\r
                </para>\r
@@ -906,7 +967,20 @@
                        The checkbox is tristate: you can show all paths, grey out the\r
                        unrelated ones, or hide the unrelated paths completely.\r
                </para>\r
-               <para>\r
+\r
+    <para>\r
+      You can show all branches history by click <guilabel>All branches</guilabel>\r
+    </para>\r
+    <para>\r
+      You can show whole project history, no choose directory or file by click\r
+      <guilabel>Show Whole Project</guilabel>\r
+    </para>\r
+    <para>\r
+      <guilabel>First Parent</guilabel> just follow up first parent commit. This will\r
+    help understand overwhole history. \r
+    </para>  \r
+    <!--\r
+      <para>\r
                        Sometimes your working practices will require log messages to follow\r
                        a particular format, which means that the text describing the changes\r
                        is not visible in the abbreviated summary shown in the top pane.\r
@@ -924,6 +998,7 @@
                                so you will not see this feature in action from the repo browser.\r
                        </para>\r
                </tip>\r
+    -->\r
        </sect2>\r
        <sect2 id="tsvn-dug-showlog-5">\r
                <?dbhh topicname="HIDD_STATGRAPH"?>\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml
index 5215ab0..33e52b4 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_rename.xml
@@ -85,18 +85,8 @@
                        </menuchoice> so that Git doesn't have to guess what\r
                        you really want to do.\r
                </para>\r
-               <para>\r
-                       If a <emphasis>folder</emphasis> is deleted via the explorer instead \r
-                       of using the TortoiseGit context menu,  your working copy will be broken\r
-                       and you will be unable to commit. If you update your working copy,\r
-                       Git will replace the missing folder with the latest version\r
-                       from the repository and you can then delete it the correct way\r
-                       using\r
-                       <menuchoice>\r
-                               <guimenu>TortoiseGit</guimenu>\r
-                               <guimenuitem>Delete</guimenuitem>\r
-                       </menuchoice>.\r
-               </para>\r
+    \r
+    \r
                <tip>\r
                        <title>Getting a deleted file or folder back</title>\r
                        <para>\r
@@ -113,10 +103,8 @@
                                the file or folder you deleted, right-click and select\r
                                <menuchoice>\r
                                        <guimenu>Context Menu</guimenu>\r
-                                       <guimenuitem>Copy to...</guimenuitem>\r
+                                       <guimenuitem>Switch/Checkout...</guimenuitem>\r
                                </menuchoice>\r
-                               as the target for that copy operation select the path to your\r
-                               working copy.\r
                        </para>\r
                </tip>\r
        </sect2>\r
@@ -164,7 +152,7 @@
                                                in the popup menu select\r
                                                <menuchoice>\r
                                                        <guimenu>Context Menu</guimenu>\r
-                                                       <guimenuitem>SVN Move versioned files here</guimenuitem>\r
+                                                       <guimenuitem>Git Move versioned files here</guimenuitem>\r
                                                </menuchoice>\r
                                        </para>\r
                                </listitem>\r
@@ -188,26 +176,32 @@
                                working copy can get really messed up.\r
                        </para>\r
                </caution>\r
+    <!--\r
                <para>\r
                        You can also use the repository browser to move items around.\r
                        Read <xref linkend="tsvn-dug-repobrowser"/> to find out more.\r
                </para>\r
+    -->\r
                <caution>\r
-                       <title>Do Not SVN Move Externals</title>\r
+                       <title>Do Not Git Move Submodule</title>\r
                        <para>\r
                                You should <emphasis>not</emphasis> use the TortoiseGit\r
                                <guilabel>Move</guilabel> or <guilabel>Rename</guilabel>\r
                                commands on a folder which has been created using\r
-                               <literal>svn:externals</literal>.\r
+                               <literal>git submodule</literal>.\r
+        <!--\r
                                This action would cause the external item to be deleted from\r
                                its parent repository, probably upsetting many other people.\r
                                If you need to move an externals folder you should use an\r
                                ordinary shell move, then adjust the\r
                                <literal>svn:externals</literal> properties of the source\r
-                               and destination parent folders.\r
+                               and destination parent folders\r
+        -->\r
+        \r
                        </para>\r
                </caution>\r
        </sect2>\r
+       <!--\r
        <sect2 id="tsvn-dug-renameincase">\r
                <title>Changing case in a filename</title>\r
                <indexterm>\r
@@ -247,6 +241,7 @@
                                </listitem>\r
                        </orderedlist>\r
                </para>\r
+\r
                <para>\r
                        Solution B)\r
                        <orderedlist>\r
@@ -274,6 +269,8 @@
                        </orderedlist>\r
                </para>\r
        </sect2>\r
+       -->\r
+       <!--\r
        <sect2 id="tsvn-dug-rename-case-conflict">\r
                <title>Dealing with filename case conflicts</title>\r
                <para>\r
@@ -306,6 +303,8 @@
                        </para>\r
                </tip>\r
        </sect2>\r
+       -->\r
+       \r
        <sect2 id="tsvn-dug-rename-repair">\r
                <title>Repairing File Renames</title>\r
                <para>\r