Update Help Document (Log)

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

diff --git a/doc/images/en/LogMessages.png b/doc/images/en/LogMessages.png
index d54ebd7..dca1168 100644 (file)
Binary files a/doc/images/en/LogMessages.png and b/doc/images/en/LogMessages.png differ

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
index 13dd177..bc0f5e7 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
@@ -68,11 +68,13 @@
                                                From the TortoiseGit context submenu\r
                                        </para>\r
                                </listitem>\r
+                               <!--\r
                                <listitem>\r
                                        <para>\r
                                                From the property page\r
                                        </para>\r
                                </listitem>\r
+                               -->\r
                                <!--\r
                                <listitem>\r
                                        <para>\r
@@ -257,6 +259,33 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <varlistentry>\r
+                                       <term>Reset (current branch) to this</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Reset current branch HEAD to selected commit. \r
+                                                       <!-- todo refer reset -->\r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
+                               <varlistentry>\r
+                                       <term>Rebase (current branch) to this</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Rebase current branch to selected commit. \r
+                                                       <!-- todo refer rebase -->\r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
+                               <varlistentry>\r
+                                       <term>Cherry Pick this commit</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Cherry Pick this commit to current branch\r
+                                                       <!-- todo refer cherry pick -->\r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
                                <!--\r
                                <varlistentry>\r
                                        <term>Revert changes from this revision</term>\r
@@ -446,15 +475,14 @@
                                </varlistentry>\r
                        </variablelist>\r
                </para>\r
-               <!--\r
+               \r
                <para>\r
                        If you select two or more revisions (using the usual\r
                        <keycap>Ctrl</keycap> or <keycap>Shift</keycap> modifiers),\r
-                       the context menu will include an entry to Revert all changes\r
-                       which were made in the selected revisions. This is the easiest\r
-                       way to rollback a group of revisions in one go.\r
+                       You can combine select commits to one commit. And cherry pick \r
+                       these commits to current branch.\r
                </para>\r
-               -->\r
+               <!--\r
                <para>\r
                        You can also choose to merge the selected revisions to another\r
                        working copy, as described above.\r
@@ -463,6 +491,7 @@
                        If all selected revisions have the same author, you can edit\r
                        the author of all those revisions in one go.\r
                </para>\r
+               -->\r
                <para>\r
                        <figure id="tsvn-dug-showlog-2-dia-2">\r
                                <title>The Log Dialog Bottom Pane with Context Menu</title>\r
@@ -470,6 +499,7 @@
                        </figure>\r
                        The bottom pane of the Log dialog also has a context menu that allows you to\r
                        <variablelist>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Show changes</term>\r
                                        <listitem>\r
@@ -501,6 +531,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Open / Open with...</term>\r
                                        <listitem>\r
@@ -519,6 +550,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Revert changes from this revision</term>\r
                                        <listitem>\r
@@ -535,6 +567,8 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Show log</term>\r
                                        <listitem>\r
@@ -562,6 +596,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                        </variablelist>\r
                </para>\r
                <tip>\r
@@ -569,8 +604,9 @@
                                You may notice that sometimes we refer to changes and other times\r
                                to differences. What's the difference?\r
                        </para>\r
+                       <!--\r
                        <para>\r
-                               Git uses revision numbers to mean 2 different things.\r
+                               Git uses commit hash to mean 2 different things.\r
                                A revision generally represents the state of the repository at\r
                                a point in time, but it can also be used to represent the changeset\r
                                which created that revision, eg. <quote>Done in r1234</quote> means \r
@@ -594,8 +630,10 @@
                                The bottom pane shows the files changed in all selected revisions,\r
                                so the context menu always offers to show <emphasis>changes</emphasis>.\r
                        </para>\r
+                       -->\r
                </tip>\r
        </sect2>\r
+       <!--\r
        <sect2 id="tsvn-dug-showlog-3">\r
                <title>Getting more log messages</title>\r
                <para>\r
@@ -668,6 +706,8 @@
                        <emphasis>all</emphasis> log messages from HEAD right back to revision 1.\r
                </para>\r
        </sect2>\r
+       -->\r
+       <!--\r
        <sect2 id="tsvn-dug-showlog-current-rev">\r
                <title>Current Working Copy Revision</title>\r
                <para>\r
@@ -689,6 +729,8 @@
                        <literal>HKCU\Software\TortoiseGit\RecursiveLogRev</literal>.\r
                </para>\r
        </sect2>\r
+       -->\r
+       <!--\r
        <sect2 id="tsvn-dug-showlog-mergetrack">\r
                <title>Merge Tracking Features</title>\r
                <indexterm>\r
@@ -723,6 +765,8 @@
                        levels.\r
                </para>\r
        </sect2>\r
+       -->\r
+       <!--\r
        <sect2 id="tsvn-dug-showlog-4">\r
                <title>Changing the Log Message and Author</title>\r
                <indexterm>\r
@@ -776,6 +820,7 @@
                        </para>\r
                </warning>\r
        </sect2>\r
+       -->\r
        <sect2 id="tsvn-dug-showlog-filter">\r
                <title>Filtering Log Messages</title>\r
                <indexterm>\r
@@ -926,6 +971,7 @@
                        then the statistics will not tell you very much.\r
                </para>\r
        </sect2>\r
+       <!--\r
        <sect2 id="tsvn-dug-showlog-cache">\r
                <?dbhh topicname="HIDD_GOOFFLINE"?>\r
                <title>Offline Mode</title>\r
@@ -936,16 +982,16 @@
                        although the information may not be up-to-date or even complete.\r
                </para>\r
        </sect2>\r
+       -->\r
        <sect2 id="tsvn-dug-showlog-refresh">\r
                <title>Refreshing the View</title>\r
                <para>\r
-                       If you want to check the server again for newer log messages,\r
+                       If you want to check the repository again for newer log messages,\r
                        you can simply refresh the view using <keycap>F5</keycap>. If you\r
                        are using the log cache (enabled by default), this will check the\r
                        repository for newer messages and fetch only the new ones.\r
-                       If the log cache was in offline mode, this will also attempt to\r
-                       go back online.\r
                </para>\r
+               <!--\r
                <para>\r
                        If you are using the log cache and you think the message content\r
                        or author may have changed, you can use <keycap>Shift-F5</keycap>\r
@@ -954,5 +1000,6 @@
                        messages currently shown and does not invalidate the entire cache\r
                        for that repository.\r
                </para>\r
+               -->\r
        </sect2>\r
 </sect1>\r