From: Frank Li <lznuaa@gmail.com>
Date: Sat, 20 Jun 2009 13:37:55 +0000 (+0800)
Subject: Add pull and fetch document
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=43765168b1c01ee73c7310c2e7301a268cb109e4

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
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
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
@@ -64,9 +64,10 @@
 	-->
   <xi:include href="./dug_create.xml"/>
   <xi:include href="./dug_clone.xml"/>
-	<xi:include href="./dug_checkout.xml"/>
-	<xi:include href="./dug_commit.xml"/>
+  <xi:include href="./dug_checkout.xml"/>
+  <xi:include href="./dug_commit.xml"/>
   <xi:include href="./dug_wcstatus.xml"/>
+  <xi:include href="./dug_pullfetch.xml"/>
 	<!--
 	<xi:include href="./dug_update.xml"/>
 	-->
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
--- 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">
 <sect1 id="tsvn-dug-clone">
   <title>Clone Repository</title>
+  <?dbhh topicname="HIDD_CLONE"?>
   <indexterm>
     <primary>Clone Repository</primary>
   </indexterm>
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
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"?>
+<!DOCTYPE sect1 SYSTEM "../../../dtd/dblite.dtd">
+<sect1 id="tsvn-dug-pull">
+  <title>Pull and Fetch change</title>
+  <?dbhh topicname="HIDD_PULLFETCH"?>
+  <indexterm>
+    <primary>Pull</primary>
+  </indexterm>
+  <indexterm>
+    <primary>Fetch</primary>
+  </indexterm>
+  <para>
+    This section talk about how to Fetch or pull change from the other
+	repository. The difference of Pull and fetch is:
+  </para>
+  <para>
+	Pull will merge remote branch change to local branch which tracked with 
+	remote branch. Fetch just get change from remote branch and never merge.
+  </para>
+  <para>
+    <menuchoice>
+      <guimenu>TortoiseGit
+      </guimenu>
+	  <guimenuitem>Pull...
+	  </guimenuitem>
+    </menuchoice>. 
+  </para>
+  <para>
+    <menuchoice>
+      <guimenu>TortoiseGit
+      </guimenu>
+	  <guimenuitem>Fetch...
+	  </guimenuitem>
+    </menuchoice>. 
+  </para>
+  <para>
+    Pull\fetch Dialog will show. <graphic fileref="../images/GitPull.png"/>
+  </para>
+  <para>
+    <guilabel>Remote:</guilabel>Choose Remote
+  </para>
+  <para>
+    <guilabel>Other:</guilabel> Input Other URL or local directory
+    You can click <guilabel>Browse</guilabel> to browse diectory. 
+  </para>
+  <para>
+    If you check<guilabel>Autoload Putty Key</guilabel> the check box, Putty key
+	will auto load by pagaent.
+  </para>
+  <para>
+    <guilabel>Manage Remotes</guilabel> to add or modify remote configuration.
+  </para>
+  <para>
+    Git clone support http, git and ssh protocol. <xref linkend="git-choose-ssh"/>Show how to choose SSH client.
+    OpenSSH, PLink or TortoisePlink. 
+  </para>
+</sect1>
\ No newline at end of file