Update Help Document

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

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

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
index bb7f15d..245f559 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml
@@ -68,6 +68,7 @@
   <xi:include href="./dug_commit.xml"/>\r
   <xi:include href="./dug_wcstatus.xml"/>\r
   <xi:include href="./dug_pullfetch.xml"/>\r
+  <xi:include href="./dug_push.xml"/>\r
        <!--\r
        <xi:include href="./dug_update.xml"/>\r
        -->\r
@@ -90,8 +91,8 @@
        -->\r
        <xi:include href="./dug_branchtag.xml"/>\r
        <xi:include href="./dug_merge.xml"/>\r
-  \r
-  <xi:include href="./dug_conflicts.xml"/>\r
+    <xi:include href="./dug_rebase.xml"/>\r
+    <xi:include href="./dug_conflicts.xml"/>\r
 \r
        <!--\r
        <xi:include href="./dug_locking.xml"/>\r

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_push.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_push.xml
new file mode 100644 (file)
index 0000000..fbb2481
--- /dev/null
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_push.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!DOCTYPE sect1 SYSTEM "../../../dtd/dblite.dtd">\r
+<sect1 id="tsvn-dug-rebase">\r
+  <title>Push</title>\r
+  <?dbhh topicname="HIDD_PUSH"?>\r
+  <indexterm>\r
+    <primary>Push</primary>\r
+  </indexterm>\r
+  <para>\r
+       Push Change to the other repository. You must push change to bare repository. \r
+       If you push change to repository with working copy, there are unexpected result.\r
+  </para>\r
+  <para>\r
+       <menuchoice>\r
+      <guimenu>TortoiseGit\r
+      </guimenu>\r
+         <guimenuitem>Push...\r
+         </guimenuitem>\r
+    </menuchoice>. \r
+  </para>\r
+  <para>\r
+       Push Dialog will show. <graphic fileref="../images/GitPush.png"/>\r
+  </para>\r
+  <sect2>\r
+       <title>Branch</title>\r
+       <para>\r
+               <guilabel>Source:</guilabel> The source branch which will push to other repository\r
+       </para>\r
+       <para>\r
+               <guilabel>Remotes:</guilabel> The remote branch of the other repository. \r
+       </para>\r
+  </sect2>\r
+  <sect2>\r
+       <title>Destination</title>\r
+       <para>\r
+               <guilabel>Remotes</guilabel> Choose remote repository.\r
+       </para>\r
+       <para>\r
+               <guilabel>Arbitary URL:</guilabel> The remote repository url. \r
+       </para>\r
+  </sect2>\r
+  <sect2>\r
+       <title>Options</title>\r
+       <para>Force Overwrite Existing Branch(May discard changeds)\r
+       </para>\r
+       <para>Use Thin Pack(For slow network connections)\r
+       </para>\r
+       <para>Include Tags\r
+       </para>\r
+       <para>Autoload Putty Key\r
+       </para>\r
+  </sect2>\r
+</sect1>
\ No newline at end of file

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_rebase.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_rebase.xml
new file mode 100644 (file)
index 0000000..5c7ea11
--- /dev/null
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_rebase.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!DOCTYPE sect1 SYSTEM "../../../dtd/dblite.dtd">\r
+<sect1 id="tsvn-dug-rebase">\r
+  <title>Rebase</title>\r
+  <?dbhh topicname="HIDD_REBASE"?>\r
+  <indexterm>\r
+    <primary>Rebase</primary>\r
+  </indexterm>\r
+  <para>\r
+       Rebase is quite complex. Please read <xref linked="Rebasin"/> to\r
+       understand git rebase.\r
+  </para>\r
+  <para>\r
+       <menuchoice>\r
+               <guimenu>TortoiseGit</guimenu>\r
+               <guimenuitem>Rebase</guimenuitem>\r
+       </menuchoice>\r
+  </para>\r
+  <para>\r
+       Rebase dialog will be shown. <graphic fileref="../images/GitRebase.png"/>\r
+  </para>\r
+</sect1>
\ No newline at end of file