diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:37:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:37:23 -0700 |
| commit | 255163d69c70539d1da70a4c63ea5338d8018484 (patch) | |
| tree | f1e3319eea5e1b06a30e14911697fd6973231feb | |
| parent | 98c882d1c4c1d32487bb11a3ba40f66f34b764e4 (diff) | |
| download | git-htmldocs-255163d69c70539d1da70a4c63ea5338d8018484.tar.gz | |
Autogenerated HTML docs for v2.28.0-258-g2befe9
31 files changed, 258 insertions, 498 deletions
diff --git a/RelNotes/2.29.0.txt b/RelNotes/2.29.0.txt index 483ebb4f8..783cba3af 100644 --- a/RelNotes/2.29.0.txt +++ b/RelNotes/2.29.0.txt @@ -19,6 +19,20 @@ UI, Workflows & Features configurable to selectively allow or reject object filtering specification used for partial cloning. + * Stop when "sendmail.*" configuration variables are defined, which + could be a mistaken attempt to define "sendemail.*" variables. + + * The existing backends for "git mergetool" based on variants of vim + have been refactored and then support for "nvim" has been added. + + * "git bisect" learns the "--first-parent" option to find the first + breakage along the first-parent chain. + + * "git log --first-parent -p" showed patches only for single-parent + commits on the first-parent chain; the "--first-parent" option has + been made to imply "-m". Use "--no-diff-merges" to restore the + previous behaviour to omit patches for merge commits. + Performance, Internal Implementation, Development Support etc. @@ -60,6 +74,14 @@ Performance, Internal Implementation, Development Support etc. easier to mark object existence checks that do and don't want to trigger lazy fetches, and a few such checks are converted using it. + * A no-op replacement function implemented as a C preprocessor macro + does not perform as good a job as one implemented as a "static + inline" function in catching errors in parameters; replace the + former with the latter in <git-compat-util.h> header. + + * Test framework update. + (merge d572f52a64 es/test-cmp-typocatcher later to maint). + Fixes since v2.28 ----------------- @@ -110,6 +132,19 @@ Fixes since v2.28 it is. (merge 11bc12ae1e rp/blame-first-parent-doc later to maint). + * The logic to find the ref transaction hook script attempted to + cache the path to the found hook without realizing that it needed + to keep a copied value, as the API it used returned a transitory + buffer space. This has been corrected. + (merge 09b2aa30c9 ps/ref-transaction-hook later to maint). + + * Recent versions of "git diff-files" shows a diff between the index + and the working tree for "intent-to-add" paths as a "new file" + patch; "git apply --cached" should be able to take "git diff-files" + and should act as an equivalent to "git add" for the path, but the + command failed to do so for such a path. + (merge 4c025c667e rp/apply-cached-with-i-t-a later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 84544f2ea3 sk/typofixes later to maint). (merge b17f411ab5 ar/help-guides-doc later to maint). @@ -124,3 +159,4 @@ Fixes since v2.28 (merge de20baf2c9 ny/notes-doc-sample-update later to maint). (merge f649aaaf82 so/rev-parser-errormessage-fix later to maint). (merge 6103d58b7f bc/sha-256-cvs-svn-updates later to maint). + (merge ac900fddb7 ma/stop-progress-null-fix later to maint). diff --git a/diff-options.txt b/diff-options.txt index 7987d72b0..b7af973d9 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -73,6 +73,11 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] +ifdef::git-log[] +-t:: + Show the tree objects in the diff output. +endif::git-log[] + --indent-heuristic:: Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default. diff --git a/git-bisect.html b/git-bisect.html index c6834a466..fdfbbacc7 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -762,7 +762,7 @@ on the subcommand:</p></div> <div class="literalblock">
<div class="content">
<pre><code>git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
- [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]
+ [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]
git bisect (bad|new|<term-new>) [<rev>]
git bisect (good|old|<term-old>) [<rev>...]
git bisect terms [--term-good | --term-bad]
@@ -1065,6 +1065,17 @@ it point to the commit that should be tested.</p></div> does not require a checked out tree.</p></div>
<div class="paragraph"><p>If the repository is bare, <code>--no-checkout</code> is assumed.</p></div>
</dd>
+<dt class="hdlist1">
+--first-parent
+</dt>
+<dd>
+<div class="paragraph"><p>Follow only the first parent commit upon seeing a merge commit.</p></div>
+<div class="paragraph"><p>In detecting regressions introduced through the merging of a branch, the merge
+commit will be identified as introduction of the bug and its ancestors will be
+ignored.</p></div>
+<div class="paragraph"><p>This option is particularly useful in avoiding false positives when a merged
+branch contained broken or non-buildable commits, but the merge itself was OK.</p></div>
+</dd>
</dl></div>
</div>
</div>
@@ -1229,7 +1240,7 @@ help</code> or <code>git bisect -h</code> to get a long usage description.</p></ <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-08-17 17:32:33 PDT
</div>
</div>
</body>
diff --git a/git-bisect.txt b/git-bisect.txt index 7586c5a84..0e993e458 100644 --- a/git-bisect.txt +++ b/git-bisect.txt @@ -17,7 +17,7 @@ The command takes various subcommands, and different options depending on the subcommand: git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>] - [--no-checkout] [<bad> [<good>...]] [--] [<paths>...] + [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...] git bisect (bad|new|<term-new>) [<rev>] git bisect (good|old|<term-old>) [<rev>...] git bisect terms [--term-good | --term-bad] @@ -365,6 +365,17 @@ does not require a checked out tree. + If the repository is bare, `--no-checkout` is assumed. +--first-parent:: ++ +Follow only the first parent commit upon seeing a merge commit. ++ +In detecting regressions introduced through the merging of a branch, the merge +commit will be identified as introduction of the bug and its ancestors will be +ignored. ++ +This option is particularly useful in avoiding false positives when a merged +branch contained broken or non-buildable commits, but the merge itself was OK. + EXAMPLES -------- diff --git a/git-config.html b/git-config.html index 0d3cc1c64..aa99b1aaf 100644 --- a/git-config.html +++ b/git-config.html @@ -4388,61 +4388,6 @@ diff.guitool <div class="ulist"><ul>
<li>
<p>
-araxis
-</p>
-</li>
-<li>
-<p>
-bc
-</p>
-</li>
-<li>
-<p>
-bc3
-</p>
-</li>
-<li>
-<p>
-codecompare
-</p>
-</li>
-<li>
-<p>
-deltawalker
-</p>
-</li>
-<li>
-<p>
-diffmerge
-</p>
-</li>
-<li>
-<p>
-diffuse
-</p>
-</li>
-<li>
-<p>
-ecmerge
-</p>
-</li>
-<li>
-<p>
-emerge
-</p>
-</li>
-<li>
-<p>
-examdiff
-</p>
-</li>
-<li>
-<p>
-guiffy
-</p>
-</li>
-<li>
-<p>
gvimdiff
</p>
</li>
@@ -4458,42 +4403,12 @@ gvimdiff3 </li>
<li>
<p>
-kdiff3
-</p>
-</li>
-<li>
-<p>
-kompare
-</p>
-</li>
-<li>
-<p>
-meld
-</p>
-</li>
-<li>
-<p>
-opendiff
-</p>
-</li>
-<li>
-<p>
-p4merge
+nvimdiff
</p>
</li>
<li>
<p>
-smerge
-</p>
-</li>
-<li>
-<p>
-tkdiff
-</p>
-</li>
-<li>
-<p>
-vimdiff
+nvimdiff2
</p>
</li>
<li>
@@ -4506,16 +4421,6 @@ vimdiff2 vimdiff3
</p>
</li>
-<li>
-<p>
-winmerge
-</p>
-</li>
-<li>
-<p>
-xxdiff
-</p>
-</li>
</ul></div>
</dd>
<dt class="hdlist1">
@@ -7118,61 +7023,6 @@ merge.guitool <div class="ulist"><ul>
<li>
<p>
-araxis
-</p>
-</li>
-<li>
-<p>
-bc
-</p>
-</li>
-<li>
-<p>
-bc3
-</p>
-</li>
-<li>
-<p>
-codecompare
-</p>
-</li>
-<li>
-<p>
-deltawalker
-</p>
-</li>
-<li>
-<p>
-diffmerge
-</p>
-</li>
-<li>
-<p>
-diffuse
-</p>
-</li>
-<li>
-<p>
-ecmerge
-</p>
-</li>
-<li>
-<p>
-emerge
-</p>
-</li>
-<li>
-<p>
-examdiff
-</p>
-</li>
-<li>
-<p>
-guiffy
-</p>
-</li>
-<li>
-<p>
gvimdiff
</p>
</li>
@@ -7188,42 +7038,12 @@ gvimdiff3 </li>
<li>
<p>
-kdiff3
-</p>
-</li>
-<li>
-<p>
-meld
-</p>
-</li>
-<li>
-<p>
-opendiff
-</p>
-</li>
-<li>
-<p>
-p4merge
-</p>
-</li>
-<li>
-<p>
-smerge
+nvimdiff
</p>
</li>
<li>
<p>
-tkdiff
-</p>
-</li>
-<li>
-<p>
-tortoisemerge
-</p>
-</li>
-<li>
-<p>
-vimdiff
+nvimdiff2
</p>
</li>
<li>
@@ -7236,16 +7056,6 @@ vimdiff2 vimdiff3
</p>
</li>
-<li>
-<p>
-winmerge
-</p>
-</li>
-<li>
-<p>
-xxdiff
-</p>
-</li>
</ul></div>
</dd>
<dt class="hdlist1">
@@ -8786,6 +8596,16 @@ sendemail.smtpReloginDelay </p>
</dd>
<dt class="hdlist1">
+sendemail.forbidSendmailVariables
+</dt>
+<dd>
+<p>
+ To avoid common misconfiguration mistakes, <a href="git-send-email.html">git-send-email(1)</a>
+ will abort with a warning if any configuration options for "sendmail"
+ exist. Set this variable to bypass the check.
+</p>
+</dd>
+<dt class="hdlist1">
sequence.editor
</dt>
<dd>
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=<ref></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>
diff --git a/git-log.txt b/git-log.txt index 3fd26d521..2b8ac5ff8 100644 --- a/git-log.txt +++ b/git-log.txt @@ -114,8 +114,51 @@ include::rev-list-options.txt[] include::pretty-formats.txt[] -COMMON DIFF OPTIONS -------------------- +DIFF FORMATTING +--------------- + +By default, `git log` does not generate any diff output. The options +below can be used to show the changes made by each commit. + +Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits +will never show a diff, even if a diff format like `--patch` is +selected, nor will they match search options like `-S`. The exception is +when `--first-parent` 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 `--no-diff-merges`). + +-c:: + 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. + +--cc:: + This flag implies the `-c` 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. + +--combined-all-paths:: + 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). + +-m:: + 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 `--first-parent` option is given; + in that case, the output represents the changes the merge + brought _into_ the then-current branch. + +--diff-merges=off:: +--no-diff-merges:: + Disable output of diffs for merge commits (default). Useful to + override `-m`, `-c`, or `--cc`. :git-log: 1 include::diff-options.txt[] diff --git a/git-merge.html b/git-merge.html index 7f3ac9158..a0a8936d3 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1905,61 +1905,6 @@ merge.guitool <div class="ulist"><ul>
<li>
<p>
-araxis
-</p>
-</li>
-<li>
-<p>
-bc
-</p>
-</li>
-<li>
-<p>
-bc3
-</p>
-</li>
-<li>
-<p>
-codecompare
-</p>
-</li>
-<li>
-<p>
-deltawalker
-</p>
-</li>
-<li>
-<p>
-diffmerge
-</p>
-</li>
-<li>
-<p>
-diffuse
-</p>
-</li>
-<li>
-<p>
-ecmerge
-</p>
-</li>
-<li>
-<p>
-emerge
-</p>
-</li>
-<li>
-<p>
-examdiff
-</p>
-</li>
-<li>
-<p>
-guiffy
-</p>
-</li>
-<li>
-<p>
gvimdiff
</p>
</li>
@@ -1975,42 +1920,12 @@ gvimdiff3 </li>
<li>
<p>
-kdiff3
-</p>
-</li>
-<li>
-<p>
-meld
-</p>
-</li>
-<li>
-<p>
-opendiff
-</p>
-</li>
-<li>
-<p>
-p4merge
-</p>
-</li>
-<li>
-<p>
-smerge
-</p>
-</li>
-<li>
-<p>
-tkdiff
+nvimdiff
</p>
</li>
<li>
<p>
-tortoisemerge
-</p>
-</li>
-<li>
-<p>
-vimdiff
+nvimdiff2
</p>
</li>
<li>
@@ -2023,16 +1938,6 @@ vimdiff2 vimdiff3
</p>
</li>
-<li>
-<p>
-winmerge
-</p>
-</li>
-<li>
-<p>
-xxdiff
-</p>
-</li>
</ul></div>
</dd>
<dt class="hdlist1">
diff --git a/git-rev-list.html b/git-rev-list.html index 9dc87a461..4ccb22160 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1043,8 +1043,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">
@@ -1877,7 +1876,7 @@ commits are marked as TREESAME (subject to be simplified away).</p></div> <div class="paragraph"><p>would be of roughly the same length. Finding the change which
introduces a regression is thus reduced to a binary search: repeatedly
generate and test new 'midpoint’s until the commit chain is of length
-one. Cannot be combined with --first-parent.</p></div>
+one.</p></div>
</dd>
<dt class="hdlist1">
--bisect-vars
diff --git a/git-shortlog.html b/git-shortlog.html index 1694c54ea..8782bc315 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -1104,8 +1104,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">
@@ -1240,7 +1239,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">
diff --git a/git-show.html b/git-show.html index ec5f6632f..94507bfa7 100644 --- a/git-show.html +++ b/git-show.html @@ -1949,6 +1949,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>
diff --git a/git-update-ref.html b/git-update-ref.html index 7c4f2a551..98eae2327 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -935,12 +935,13 @@ still see a subset of the modifications.</p></div> <div class="sect1">
<h2 id="_logging_updates">LOGGING UPDATES</h2>
<div class="sectionbody">
-<div class="paragraph"><p>If config parameter "core.logAllRefUpdates" is true and the ref is one under
-"refs/heads/", "refs/remotes/", "refs/notes/", or the symbolic ref HEAD; or
-the file "$GIT_DIR/logs/<ref>" exists then <code>git update-ref</code> will append
-a line to the log file "$GIT_DIR/logs/<ref>" (dereferencing all
-symbolic refs before creating the log name) describing the change
-in ref value. Log lines are formatted as:</p></div>
+<div class="paragraph"><p>If config parameter "core.logAllRefUpdates" is true and the ref is one
+under "refs/heads/", "refs/remotes/", "refs/notes/", or a pseudoref
+like HEAD or ORIG_HEAD; or the file "$GIT_DIR/logs/<ref>" exists then
+<code>git update-ref</code> will append a line to the log file
+"$GIT_DIR/logs/<ref>" (dereferencing all symbolic refs before creating
+the log name) describing the change in ref value. Log lines are
+formatted as:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>oldsha1 SP newsha1 SP committer LF</code></pre>
@@ -972,7 +973,7 @@ or does not have committer information available.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-29 16:59:10 PDT
+ 2020-08-17 17:32:33 PDT
</div>
</div>
</body>
diff --git a/git-update-ref.txt b/git-update-ref.txt index 3e737c236..d401234b0 100644 --- a/git-update-ref.txt +++ b/git-update-ref.txt @@ -148,12 +148,13 @@ still see a subset of the modifications. LOGGING UPDATES --------------- -If config parameter "core.logAllRefUpdates" is true and the ref is one under -"refs/heads/", "refs/remotes/", "refs/notes/", or the symbolic ref HEAD; or -the file "$GIT_DIR/logs/<ref>" exists then `git update-ref` will append -a line to the log file "$GIT_DIR/logs/<ref>" (dereferencing all -symbolic refs before creating the log name) describing the change -in ref value. Log lines are formatted as: +If config parameter "core.logAllRefUpdates" is true and the ref is one +under "refs/heads/", "refs/remotes/", "refs/notes/", or a pseudoref +like HEAD or ORIG_HEAD; or the file "$GIT_DIR/logs/<ref>" exists then +`git update-ref` will append a line to the log file +"$GIT_DIR/logs/<ref>" (dereferencing all symbolic refs before creating +the log name) describing the change in ref value. Log lines are +formatted as: oldsha1 SP newsha1 SP committer LF diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 93518724c..fb1233b72 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:56 PDT
+ 2020-08-17 17:34:08 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 0bca36504..f41e041fe 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:56 PDT
+ 2020-08-17 17:34:08 PDT
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index 3f30395bc..662471242 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:52 PDT
+ 2020-08-17 17:34:02 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index c6d8d14b9..4898f033b 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:55 PDT
+ 2020-08-17 17:34:08 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index af7409efd..37cefab0f 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:55 PDT
+ 2020-08-17 17:34:07 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index f73828e30..090ee1ae2 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:55 PDT
+ 2020-08-17 17:34:06 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 797a7bf53..4c92140fb 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:55 PDT
+ 2020-08-17 17:34:07 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index faef614e7..0bd086429 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:54 PDT
+ 2020-08-17 17:34:06 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index fa76b6f60..fae13f849 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:52 PDT
+ 2020-08-17 17:34:02 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 99bff03b3..8a755c661 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master"</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:54 PDT
+ 2020-08-17 17:34:05 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 13c8c65d6..a5c1239a5 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:54 PDT
+ 2020-08-17 17:34:04 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index f832f58fe..dfe07c985 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:53 PDT
+ 2020-08-17 17:34:04 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index d65992c4b..3955a60b8 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:53 PDT
+ 2020-08-17 17:34:04 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index bec3669f4..5818aad54 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:53 PDT
+ 2020-08-17 17:34:03 PDT
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 07c34d293..ea5e8fb9d 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-13 15:03:53 PDT
+ 2020-08-17 17:34:03 PDT
</div>
</div>
</body>
diff --git a/mergetools-diff.txt b/mergetools-diff.txt index a80aa379e..a9a59f9a7 100644 --- a/mergetools-diff.txt +++ b/mergetools-diff.txt @@ -1,26 +1,7 @@ -* araxis -* bc -* bc3 -* codecompare -* deltawalker -* diffmerge -* diffuse -* ecmerge -* emerge -* examdiff -* guiffy * gvimdiff * gvimdiff2 * gvimdiff3 -* kdiff3 -* kompare -* meld -* opendiff -* p4merge -* smerge -* tkdiff -* vimdiff +* nvimdiff +* nvimdiff2 * vimdiff2 * vimdiff3 -* winmerge -* xxdiff diff --git a/mergetools-merge.txt b/mergetools-merge.txt index 39f764a78..a9a59f9a7 100644 --- a/mergetools-merge.txt +++ b/mergetools-merge.txt @@ -1,26 +1,7 @@ -* araxis -* bc -* bc3 -* codecompare -* deltawalker -* diffmerge -* diffuse -* ecmerge -* emerge -* examdiff -* guiffy * gvimdiff * gvimdiff2 * gvimdiff3 -* kdiff3 -* meld -* opendiff -* p4merge -* smerge -* tkdiff -* tortoisemerge -* vimdiff +* nvimdiff +* nvimdiff2 * vimdiff2 * vimdiff3 -* winmerge -* xxdiff diff --git a/rev-list-options.txt b/rev-list-options.txt index b01b2b677..002379056 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -128,8 +128,7 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). 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. --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) @@ -207,7 +206,7 @@ ifndef::git-rev-list[] Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command - line. Cannot be combined with --first-parent. + line. endif::git-rev-list[] --stdin:: @@ -743,7 +742,7 @@ outputs 'midpoint', the output of the two commands would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length -one. Cannot be combined with --first-parent. +one. --bisect-vars:: This calculates the same as `--bisect`, except that refs in @@ -1117,48 +1116,3 @@ ifdef::git-rev-list[] by a tab. endif::git-rev-list[] endif::git-shortlog[] - -ifndef::git-shortlog[] -ifndef::git-rev-list[] -Diff Formatting -~~~~~~~~~~~~~~~ - -Listed below are options that control the formatting of diff output. -Some of them are specific to linkgit:git-rev-list[1], however other diff -options may be given. See linkgit:git-diff-files[1] for more options. - --c:: - 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. - ---cc:: - This flag implies the `-c` 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. - ---combined-all-paths:: - 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). - --m:: - 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 `--first-parent` option is given; - in that case, the output represents the changes the merge - brought _into_ the then-current branch. - --r:: - Show recursive diffs. - --t:: - Show the tree objects in the diff output. This implies `-r`. -endif::git-rev-list[] -endif::git-shortlog[] |