OSDN Git Service

Update log dialog help document
authorFrank Li <lznuaa@gmail.com>
Mon, 15 Jun 2009 05:12:21 +0000 (13:12 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 15 Jun 2009 05:12:21 +0000 (13:12 +0800)
doc/images/en/LogContextMenu.png
doc/images/en/LogContextMenu1.png
doc/images/en/LogContextMenu2.png
doc/images/en/LogMessages.png
doc/source/en/TortoiseGit/tsvn_dug/dug.xml
doc/source/en/TortoiseGit/tsvn_dug/dug_checkout.xml
doc/source/en/TortoiseGit/tsvn_dug/dug_clone.xml
doc/source/en/TortoiseGit/tsvn_dug/dug_commit.xml
doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml

index e4175d9..acc395f 100644 (file)
Binary files a/doc/images/en/LogContextMenu.png and b/doc/images/en/LogContextMenu.png differ
index cc5e66f..ad28bc5 100644 (file)
Binary files a/doc/images/en/LogContextMenu1.png and b/doc/images/en/LogContextMenu1.png differ
index 40a2447..7e73719 100644 (file)
Binary files a/doc/images/en/LogContextMenu2.png and b/doc/images/en/LogContextMenu2.png differ
index dca1168..2e9f61f 100644 (file)
Binary files a/doc/images/en/LogMessages.png and b/doc/images/en/LogMessages.png differ
index 92f25cf..a551eaa 100644 (file)
   <xi:include href="./dug_clone.xml"/>\r
        <xi:include href="./dug_checkout.xml"/>\r
        <xi:include href="./dug_commit.xml"/>\r
+  <xi:include href="./dug_wcstatus.xml"/>\r
        <!--\r
        <xi:include href="./dug_update.xml"/>\r
        -->\r
-       <xi:include href="./dug_conflicts.xml"/>\r
-       <xi:include href="./dug_wcstatus.xml"/>\r
+       \r
        <!--\r
        <xi:include href="./dug_changelist.xml"/>\r
        -->\r
@@ -89,6 +89,9 @@
        -->\r
        <xi:include href="./dug_branchtag.xml"/>\r
        <xi:include href="./dug_merge.xml"/>\r
+  \r
+  <xi:include href="./dug_conflicts.xml"/>\r
+\r
        <!--\r
        <xi:include href="./dug_locking.xml"/>\r
        -->\r
index f032426..6e29292 100644 (file)
                </figure>\r
                If you enter a branch name at <guilabel>Create New Branch</guilabel>, new branch created and switch to new branchs.\r
        </para>\r
+  <para>\r
+    You can click <guilabel>...</guilabel> to browse git log and choose special version. \r
+  </para>\r
+  <para>\r
+    Check <guilabel>Force</guilabel> will overwrite working copy with repository version.\r
+  </para>\r
+  <para>\r
+    Check <guilabel>Track</guilabel> will track remote branch with local branch. When you pull change from remote\r
+    repository, tracked local branch will merged remote branch change.\r
+  </para>\r
        <!--\r
        <sect2 id="tsvn-dug-checkout-depth">\r
                <title>Checkout Depth</title>\r
index 3f8cb36..b51d158 100644 (file)
@@ -33,6 +33,9 @@
     You can click <guilabel>...</guilabel> to browse putty key file.\r
   </para>\r
   <para>\r
+    Clone will checkout currrent HEAD to work space automatically. \r
+  </para>\r
+  <para>\r
     Git clone support http, git and ssh protocol. <xref linkend="git-choose-ssh"/>Show how to choose SSH client.\r
     OpenSSH, PLink or TortoisePlink. \r
   </para>\r
index 3264491..460b998 100644 (file)
@@ -97,7 +97,7 @@
                                        -->\r
                                        <listitem>\r
                                                <para>\r
-                                                       add the file to the <literal>git:ignore</literal> list\r
+                                                       add the file to the <literal>.gitignore</literal> list\r
                                                        using\r
                                                        <menuchoice>\r
                                                                <guimenu>TortoiseGit</guimenu>\r
index bc0f5e7..c5edc82 100644 (file)
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
-                               -->\r
+                               \r
                                <varlistentry>\r
                                        <term>Open / Open with...</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+        -->\r
                                <!--\r
                                <varlistentry>\r
                                        <term>Browse repository</term>\r
                                        </listitem>\r
                                </varlistentry>\r
                                -->\r
-                               <varlistentry>\r
-                                       <term>Create branch from revision</term>\r
-                                       <listitem>\r
-                                               <para>\r
-                                                       Create a branch from a selected revision.\r
-                                                       This is useful e.g. \r
-                                               </para>\r
-                                       </listitem>\r
-                               </varlistentry>\r
-                               <varlistentry>\r
-                                       <term>Create tag from revision</term>\r
+        <varlistentry>\r
+                                       <term>Reset (current branch) to this</term>\r
                                        <listitem>\r
                                                <para>\r
-                                                       Create a tag from a selected revision.\r
-                                                       This is useful e.g. \r
+                                                       Reset current branch HEAD to selected commit. \r
+                                                       <!-- todo refer reset -->\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
-                               <varlistentry>\r
+          \r
+       <varlistentry>\r
                                        <term>Switch\Checkout to revision</term>\r
                                        <listitem>\r
                                                <para>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+            \r
                                <varlistentry>\r
-                                       <term>Reset (current branch) to this</term>\r
+                                       <term>Create branch from revision</term>\r
                                        <listitem>\r
                                                <para>\r
-                                                       Reset current branch HEAD to selected commit. \r
-                                                       <!-- todo refer reset -->\r
+                                                       Create a branch from a selected revision.\r
+                                                       This is useful e.g. \r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
                                <varlistentry>\r
+                                       <term>Create tag from revision</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Create a tag from a selected revision.\r
+                                                       This is useful e.g. \r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
+                               \r
+                               \r
+                               <varlistentry>\r
                                        <term>Rebase (current branch) to this</term>\r
                                        <listitem>\r
                                                <para>\r
                                </varlistentry>\r
                                -->\r
                                <varlistentry>\r
-                                       <term>Export...</term>\r
+                                       <term>Export this version...</term>\r
                                        <listitem>\r
                                                <para>\r
                                                        Export the selected file/folder at the selected\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+        <varlistentry>\r
+                                       <term>Format Patch...</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Create Patchs from this commit.\r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
                        </variablelist>\r
                </para>\r
                <para>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+        <varlistentry>\r
+          <term>Combine to one commit</term>\r
+          <listitem>\r
+            <para>\r
+              Combine continuous commits to one commit.\r
+            </para>\r
+          </listitem>\r
+        </varlistentry>\r
+        <varlistentry>\r
+                                       <term>Cherry Pick this version</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Cherry Pick Chosen Commits. \r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
+        <varlistentry>\r
+                                       <term>Fomat Patch...</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Create patchs between chosen two commits.\r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
                                <varlistentry>\r
                                        <term>Copy to clipboard</term>\r
                                        <listitem>\r