Autogenerated HTML docs for v2.28.0-258-g2befe9

1 files changed, 82 insertions, 77 deletions

diff --git a/git-log.html b/git-log.html
index 76992bfd0..b25445f4d 100644
--- a/git-log.html
+++ b/git-log.html
@@ -1207,8 +1207,7 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim
         because merges into a topic branch tend to be only about

         adjusting to updated upstream from time to time, and

         this option allows you to ignore the individual commits

-        brought in to your history by such a merge. Cannot be

-        combined with --bisect.

+        brought in to your history by such a merge.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1343,7 +1342,7 @@ explicitly.</p></div>
         Pretend as if the bad bisection ref <code>refs/bisect/bad</code>

         was listed and as if it was followed by <code>--not</code> and the good

         bisection refs <code>refs/bisect/good-*</code> on the command

-        line. Cannot be combined with --first-parent.

+        line.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2395,78 +2394,6 @@ the time zone is omitted when the local time zone is used
 </dd>

 </dl></div>

 </div>

-<div class="sect2">

-<h3 id="_diff_formatting">Diff Formatting</h3>

-<div class="paragraph"><p>Listed below are options that control the formatting of diff output.

-Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff

-options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>

-<div class="dlist"><dl>

-<dt class="hdlist1">

--c

-</dt>

-<dd>

-<p>

-        With this option, diff output for a merge commit

-        shows the differences from each of the parents to the merge result

-        simultaneously instead of showing pairwise diff between a parent

-        and the result one at a time. Furthermore, it lists only files

-        which were modified from all parents.

-</p>

-</dd>

-<dt class="hdlist1">

---cc

-</dt>

-<dd>

-<p>

-        This flag implies the <code>-c</code> option and further compresses the

-        patch output by omitting uninteresting hunks whose contents in

-        the parents have only two variants and the merge result picks

-        one of them without modification.

-</p>

-</dd>

-<dt class="hdlist1">

---combined-all-paths

-</dt>

-<dd>

-<p>

-        This flag causes combined diffs (used for merge commits) to

-        list the name of the file from all parents.  It thus only has

-        effect when -c or --cc are specified, and is likely only

-        useful if filename changes are detected (i.e. when either

-        rename or copy detection have been requested).

-</p>

-</dd>

-<dt class="hdlist1">

--m

-</dt>

-<dd>

-<p>

-        This flag makes the merge commits show the full diff like

-        regular commits; for each merge parent, a separate log entry

-        and diff is generated. An exception is that only diff against

-        the first parent is shown when <code>--first-parent</code> option is given;

-        in that case, the output represents the changes the merge

-        brought <em>into</em> the then-current branch.

-</p>

-</dd>

-<dt class="hdlist1">

--r

-</dt>

-<dd>

-<p>

-        Show recursive diffs.

-</p>

-</dd>

-<dt class="hdlist1">

--t

-</dt>

-<dd>

-<p>

-        Show the tree objects in the diff output. This implies <code>-r</code>.

-</p>

-</dd>

-</dl></div>

-</div>

 </div>

 </div>

 <div class="sect1">

@@ -3399,8 +3326,78 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
 </div>

 </div>

 <div class="sect1">

-<h2 id="_common_diff_options">COMMON DIFF OPTIONS</h2>

+<h2 id="_diff_formatting">DIFF FORMATTING</h2>

 <div class="sectionbody">

+<div class="paragraph"><p>By default, <code>git log</code> does not generate any diff output. The options

+below can be used to show the changes made by each commit.</p></div>

+<div class="paragraph"><p>Note that unless one of <code>-c</code>, <code>--cc</code>, or <code>-m</code> is given, merge commits

+will never show a diff, even if a diff format like <code>--patch</code> is

+selected, nor will they match search options like <code>-S</code>. The exception is

+when <code>--first-parent</code> is in use, in which merges are treated like normal

+single-parent commits (this can be overridden by providing a

+combined-diff option or with <code>--no-diff-merges</code>).</p></div>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+-c

+</dt>

+<dd>

+<p>

+        With this option, diff output for a merge commit

+        shows the differences from each of the parents to the merge result

+        simultaneously instead of showing pairwise diff between a parent

+        and the result one at a time. Furthermore, it lists only files

+        which were modified from all parents.

+</p>

+</dd>

+<dt class="hdlist1">

+--cc

+</dt>

+<dd>

+<p>

+        This flag implies the <code>-c</code> option and further compresses the

+        patch output by omitting uninteresting hunks whose contents in

+        the parents have only two variants and the merge result picks

+        one of them without modification.

+</p>

+</dd>

+<dt class="hdlist1">

+--combined-all-paths

+</dt>

+<dd>

+<p>

+        This flag causes combined diffs (used for merge commits) to

+        list the name of the file from all parents.  It thus only has

+        effect when -c or --cc are specified, and is likely only

+        useful if filename changes are detected (i.e. when either

+        rename or copy detection have been requested).

+</p>

+</dd>

+<dt class="hdlist1">

+-m

+</dt>

+<dd>

+<p>

+        This flag makes the merge commits show the full diff like

+        regular commits; for each merge parent, a separate log entry

+        and diff is generated. An exception is that only diff against

+        the first parent is shown when <code>--first-parent</code> option is given;

+        in that case, the output represents the changes the merge

+        brought <em>into</em> the then-current branch.

+</p>

+</dd>

+<dt class="hdlist1">

+--diff-merges=off

+</dt>

+<dt class="hdlist1">

+--no-diff-merges

+</dt>

+<dd>

+<p>

+        Disable output of diffs for merge commits (default). Useful to

+        override <code>-m</code>, <code>-c</code>, or <code>--cc</code>.

+</p>

+</dd>

+</dl></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

 -p

@@ -3486,6 +3483,14 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
 </p>

 </dd>

 <dt class="hdlist1">

+-t

+</dt>

+<dd>

+<p>

+        Show the tree objects in the diff output.

+</p>

+</dd>

+<dt class="hdlist1">

 --indent-heuristic

 </dt>

 <dd>

@@ -5154,7 +5159,7 @@ and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-30 14:18:13 PDT

+ 2020-08-17 17:32:33 PDT

 </div>

 </div>

 </body>