projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f98fd88)
Autogenerated HTML docs for v1.4.4.1-g3c23
authorJunio C Hamano <junio@hera.kernel.org>
Mon, 27 Nov 2006 20:03:22 +0000 (20:03 +0000)
committerJunio C Hamano <junio@hera.kernel.org>
Mon, 27 Nov 2006 20:03:22 +0000 (20:03 +0000)
git-merge.html patch | blob | history
git-merge.txt patch | blob | history
git-shortlog.html patch | blob | history
git-shortlog.txt patch | blob | history

diff --git a/git-merge.html b/git-merge.html
index cb7d62aaa8995ade8dba84b6c790bf942d29ed82..c0bab8440040837852be6496a038f2a767d75d48 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -272,11 +272,14 @@ git-merge(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-merge</em> [-n] [--no-commit] [-s &lt;strategy&gt;]&#8230; &lt;msg&gt; &lt;head&gt; &lt;remote&gt; &lt;remote&gt;&#8230;</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-merge</em> [-n] [--no-commit] [--squash] [-s &lt;strategy&gt;]&#8230;\r
+        [--reflog-action=&lt;action&gt;]\r
+        -m=&lt;msg&gt; &lt;remote&gt; &lt;remote&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
-<p>This is the top-level user interface to the merge machinery\r
+<p>This is the top-level interface to the merge machinery\r
 which drives multiple merge strategy scripts.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
@@ -341,7 +344,8 @@ which drives multiple merge strategy scripts.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        our branch head commit.\r
+        Our branch head commit.  This has to be <tt>HEAD</tt>, so new\r
+        syntax does not require it\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -349,11 +353,21 @@ which drives multiple merge strategy scripts.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        other branch head merged into our branch.  You need at\r
+        Other branch head merged into our branch.  You need at\r
         least one &lt;remote&gt;.  Specifying more than one &lt;remote&gt;\r
         obviously means you are trying an Octopus.\r
 </p>\r
 </dd>\r
+<dt>\r
+--reflog-action=&lt;action&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        This is used internally when <tt>git-pull</tt> calls this command\r
+        to record that the merge was created by <tt>pull</tt> command\r
+        in the <tt>ref-log</tt> entry that results from the merge.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>MERGE STRATEGIES</h2>\r
@@ -567,7 +581,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:13 UTC\r
+Last updated 27-Nov-2006 20:03:14 UTC\r
 </div>\r
 </div>\r
 </body>\r
diff --git a/git-merge.txt b/git-merge.txt
index bebf30ad3db951c0a0bad01ebee619821781eb39..e2954aa76eef46101f38683eb346bd31bf711a40 100644 (file)
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -8,12 +8,14 @@ git-merge - Grand Unified Merge Driver
 
 SYNOPSIS
 --------
-'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>...
-
+[verse]
+'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
+       [--reflog-action=<action>]
+       -m=<msg> <remote> <remote>...
 
 DESCRIPTION
 -----------
-This is the top-level user interface to the merge machinery
+This is the top-level interface to the merge machinery
 which drives multiple merge strategy scripts.
 
 
@@ -27,13 +29,19 @@ include::merge-options.txt[]
        to give a good default for automated `git-merge` invocations.
 
 <head>::
-       our branch head commit.
+       Our branch head commit.  This has to be `HEAD`, so new
+       syntax does not require it
 
 <remote>::
-       other branch head merged into our branch.  You need at
+       Other branch head merged into our branch.  You need at
        least one <remote>.  Specifying more than one <remote>
        obviously means you are trying an Octopus.
 
+--reflog-action=<action>::
+       This is used internally when `git-pull` calls this command
+       to record that the merge was created by `pull` command
+       in the `ref-log` entry that results from the merge.
+
 include::merge-strategies.txt[]
 
 
diff --git a/git-shortlog.html b/git-shortlog.html
index 50d52c76d67fea69e4e7fb0a05a4a11c3bd83316..c55f6250cc3c3ff1a5162ae0b39a6ea15109f18d 100644 (file)
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -272,7 +272,8 @@ git-shortlog(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p>git-log --pretty=short | <em>git-shortlog</em> [-h] [-n] [-s]</p>\r
+<p>git-log --pretty=short | <em>git-shortlog</em> [-h] [-n] [-s]\r
+git-shortlog [-n|--number] [-s|--summary] [&lt;committish&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -347,7 +348,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Oct-2006 19:10:27 UTC\r
+Last updated 27-Nov-2006 20:03:15 UTC\r
 </div>\r
 </div>\r
 </body>\r
diff --git a/git-shortlog.txt b/git-shortlog.txt
index d54fc3e5c6d7ba3be31fa2c1238e2d7039c92e74..95fa9010c1539e4c93d6d402ffd4bb670fd32910 100644 (file)
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -8,6 +8,7 @@ git-shortlog - Summarize 'git log' output
 SYNOPSIS
 --------
 git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s]
+git-shortlog [-n|--number] [-s|--summary] [<committish>...]
 
 DESCRIPTION
 -----------
Git—the stupid content tracker