Add pull and fetch document

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

diff --git a/doc/images/en/GitPull.png b/doc/images/en/GitPull.png
new file mode 100644 (file)
index 0000000..2ab640f
Binary files /dev/null and b/doc/images/en/GitPull.png differ

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
index a551eaa..bb7f15d 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
@@ -64,9 +64,10 @@
        -->\r
   <xi:include href="./dug_create.xml"/>\r
   <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_checkout.xml"/>\r
+  <xi:include href="./dug_commit.xml"/>\r
   <xi:include href="./dug_wcstatus.xml"/>\r
+  <xi:include href="./dug_pullfetch.xml"/>\r
        <!--\r
        <xi:include href="./dug_update.xml"/>\r
        -->\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_clone.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_clone.xml
index b51d158..8c9a142 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_clone.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_clone.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE sect1 SYSTEM "../../../dtd/dblite.dtd">\r
 <sect1 id="tsvn-dug-clone">\r
   <title>Clone Repository</title>\r
+  <?dbhh topicname="HIDD_CLONE"?>\r
   <indexterm>\r
     <primary>Clone Repository</primary>\r
   </indexterm>\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml
new file mode 100644 (file)
index 0000000..f0c27df
--- /dev/null
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!DOCTYPE sect1 SYSTEM "../../../dtd/dblite.dtd">\r
+<sect1 id="tsvn-dug-pull">\r
+  <title>Pull and Fetch change</title>\r
+  <?dbhh topicname="HIDD_PULLFETCH"?>\r
+  <indexterm>\r
+    <primary>Pull</primary>\r
+  </indexterm>\r
+  <indexterm>\r
+    <primary>Fetch</primary>\r
+  </indexterm>\r
+  <para>\r
+    This section talk about how to Fetch or pull change from the other\r
+       repository. The difference of Pull and fetch is:\r
+  </para>\r
+  <para>\r
+       Pull will merge remote branch change to local branch which tracked with \r
+       remote branch. Fetch just get change from remote branch and never merge.\r
+  </para>\r
+  <para>\r
+    <menuchoice>\r
+      <guimenu>TortoiseGit\r
+      </guimenu>\r
+         <guimenuitem>Pull...\r
+         </guimenuitem>\r
+    </menuchoice>. \r
+  </para>\r
+  <para>\r
+    <menuchoice>\r
+      <guimenu>TortoiseGit\r
+      </guimenu>\r
+         <guimenuitem>Fetch...\r
+         </guimenuitem>\r
+    </menuchoice>. \r
+  </para>\r
+  <para>\r
+    Pull\fetch Dialog will show. <graphic fileref="../images/GitPull.png"/>\r
+  </para>\r
+  <para>\r
+    <guilabel>Remote:</guilabel>Choose Remote\r
+  </para>\r
+  <para>\r
+    <guilabel>Other:</guilabel> Input Other URL or local directory\r
+    You can click <guilabel>Browse</guilabel> to browse diectory. \r
+  </para>\r
+  <para>\r
+    If you check<guilabel>Autoload Putty Key</guilabel> the check box, Putty key\r
+       will auto load by pagaent.\r
+  </para>\r
+  <para>\r
+    <guilabel>Manage Remotes</guilabel> to add or modify remote configuration.\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
+</sect1>
\ No newline at end of file