diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:40:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:40:11 -0800 |
| commit | 034a2ff96f3a3aa981e5ae4e242cefa4bd00323b (patch) | |
| tree | 1c5b32a38d12b6114e1c6c3552b897e87f5140b0 | |
| parent | f1fc6ca2d27889be2f7829e15054bc8067ae9bc6 (diff) | |
| download | git-htmldocs-034a2ff96f3a3aa981e5ae4e242cefa4bd00323b.tar.gz | |
Autogenerated HTML docs for v2.35.1-225-ge2ac9
25 files changed, 142 insertions, 54 deletions
diff --git a/RelNotes/2.36.0.txt b/RelNotes/2.36.0.txt index 3dfa5e409..3e1261c58 100644 --- a/RelNotes/2.36.0.txt +++ b/RelNotes/2.36.0.txt @@ -25,6 +25,15 @@ UI, Workflows & Features * "git log --remerge-diff" shows the difference from mechanical merge result and the result that is actually recorded in a merge commit. + * "git log" and friends learned an option --exclude-first-parent-only + to propagate UNINTERESTING bit down only along the first-parent + chain, just like --first-parent option shows commits that lack the + UNINTERESTING bit only along the first-parent chain. + + * The command line completion script (in contrib/) learned to + complete all Git subcommands, including the ones that are normally + hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used. + Performance, Internal Implementation, Development Support etc. @@ -47,6 +56,9 @@ Performance, Internal Implementation, Development Support etc. all. Start the process of renaming it to "--annotate-stdin". (merge a2585719b3 jc/name-rev-stdin later to maint). + * "git update-index", "git checkout-index", and "git clean" are + taught to work better with the sparse checkout feature. + Fixes since v2.35 ----------------- @@ -140,6 +152,16 @@ Fixes since v2.35 * "git diff --diff-filter=aR" is now parsed correctly. (merge 75408ca949 js/diff-filter-negation-fix later to maint). + * When "git subtree" wants to create a merge, it used "git merge" and + let it be affected by end-user's "merge.ff" configuration, which + has been corrected. + (merge 9158a3564a tk/subtree-merge-not-ff-only later to maint). + + * Unlike "git apply", "git patch-id" did not handle patches with + hunks that has only 1 line in either preimage or postimage, which + has been corrected. + (merge 757e75c81e jz/patch-id-hunk-header-parsing-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge cfc5cf428b jc/find-header later to maint). (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint). @@ -157,3 +179,5 @@ Fixes since v2.35 (merge 45d0212a71 ll/doc-mktree-typofix later to maint). (merge e9b272e4c1 js/no-more-legacy-stash later to maint). (merge 6798b08e84 ab/do-not-hide-failures-in-git-dot-pm later to maint). + (merge 9325285df4 po/doc-check-ignore-markup-fix later to maint). + (merge cd26cd6c7c sy/modernize-t-lib-read-tree-m-3way later to maint). diff --git a/git-check-ignore.html b/git-check-ignore.html index 97e8479b5..bfd5a4e59 100644 --- a/git-check-ignore.html +++ b/git-check-ignore.html @@ -787,7 +787,7 @@ subject to exclude rules; but see ‘--no-index’.</p></div> Instead of printing the paths that are excluded, for each path
that matches an exclude pattern, print the exclude pattern
together with the path. (Matching an exclude pattern usually
- means the path is excluded, but if the pattern begins with <em>!</em>
+ means the path is excluded, but if the pattern begins with "<code>!</code>"
then it is a negated pattern and matching it means the path is
NOT excluded.)
</p>
@@ -851,7 +851,7 @@ ignored.</p></div> <div class="paragraph"><p><pathname> is the path of a file being queried, <pattern> is the
matching pattern, <source> is the pattern’s source file, and <linenum>
is the line number of the pattern within that source. If the pattern
-contained a <code>!</code> prefix or <code>/</code> suffix, it will be preserved in the
+contained a "<code>!</code>" prefix or "<code>/</code>" suffix, it will be preserved in the
output. <source> will be an absolute path when referring to the file
configured by <code>core.excludesFile</code>, or relative to the repository root
when referring to <code>.git/info/exclude</code> or a per-directory exclude file.</p></div>
@@ -924,7 +924,7 @@ buffer.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2022-02-17 16:38:18 PST
</div>
</div>
</body>
diff --git a/git-check-ignore.txt b/git-check-ignore.txt index 0c3924a63..2892799e3 100644 --- a/git-check-ignore.txt +++ b/git-check-ignore.txt @@ -33,7 +33,7 @@ OPTIONS Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually - means the path is excluded, but if the pattern begins with '!' + means the path is excluded, but if the pattern begins with "`!`" then it is a negated pattern and matching it means the path is NOT excluded.) + @@ -77,7 +77,7 @@ If `--verbose` is specified, the output is a series of lines of the form: <pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern -contained a `!` prefix or `/` suffix, it will be preserved in the +contained a "`!`" prefix or "`/`" suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file. diff --git a/git-checkout-index.html b/git-checkout-index.html index 0048e90a9..3ed1093ea 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -752,6 +752,7 @@ git-checkout-index(1) Manual Page <pre class="content"><em>git checkout-index</em> [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
[--stage=<number>|all]
[--temp]
+ [--ignore-skip-worktree-bits]
[-z] [--stdin]
[--] [<file>…]</pre>
<div class="attribution">
@@ -811,8 +812,9 @@ git-checkout-index(1) Manual Page </dt>
<dd>
<p>
- checks out all files in the index. Cannot be used
- together with explicit filenames.
+ checks out all files in the index except for those with the
+ skip-worktree bit set (see <code>--ignore-skip-worktree-bits</code>).
+ Cannot be used together with explicit filenames.
</p>
</dd>
<dt class="hdlist1">
@@ -857,6 +859,15 @@ git-checkout-index(1) Manual Page </p>
</dd>
<dt class="hdlist1">
+--ignore-skip-worktree-bits
+</dt>
+<dd>
+<p>
+ Check out all files, including those with the skip-worktree bit
+ set.
+</p>
+</dd>
+<dt class="hdlist1">
--stdin
</dt>
<dd>
@@ -1009,7 +1020,7 @@ into the file <code>.merged-Makefile</code>.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2022-02-17 16:38:18 PST
</div>
</div>
</body>
diff --git a/git-checkout-index.txt b/git-checkout-index.txt index 4d33e7be0..01dbd5cbf 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>] [--stage=<number>|all] [--temp] + [--ignore-skip-worktree-bits] [-z] [--stdin] [--] [<file>...] @@ -37,8 +38,9 @@ OPTIONS -a:: --all:: - checks out all files in the index. Cannot be used - together with explicit filenames. + checks out all files in the index except for those with the + skip-worktree bit set (see `--ignore-skip-worktree-bits`). + Cannot be used together with explicit filenames. -n:: --no-create:: @@ -59,6 +61,10 @@ OPTIONS write the content to temporary files. The temporary name associations will be written to stdout. +--ignore-skip-worktree-bits:: + Check out all files, including those with the skip-worktree bit + set. + --stdin:: Instead of taking list of paths from the command line, read list of paths from the standard input. Paths are diff --git a/git-log.html b/git-log.html index 344112309..ad891d549 100644 --- a/git-log.html +++ b/git-log.html @@ -1205,18 +1205,31 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim </dt>
<dd>
<p>
- Follow only the first parent commit upon seeing a merge
- commit. This option can give a better overview when
- viewing the evolution of a particular topic branch,
- 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.
+ When finding commits to include, follow only the first
+ parent commit upon seeing a merge commit. This option
+ can give a better overview when viewing the evolution of
+ a particular topic branch, 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.
</p>
<div class="paragraph"><p>This option also changes default diff format for merge commits
to <code>first-parent</code>, see <code>--diff-merges=first-parent</code> for details.</p></div>
</dd>
<dt class="hdlist1">
+--exclude-first-parent-only
+</dt>
+<dd>
+<p>
+ When finding commits to exclude (with a <em>^</em>), follow only
+ the first parent commit upon seeing a merge commit.
+ This can be used to find the set of changes in a topic branch
+ from the point where it diverged from the remote branch, given
+ that arbitrary merges can be valid topic branch changes.
+</p>
+</dd>
+<dt class="hdlist1">
--not
</dt>
<dd>
diff --git a/git-rev-list.html b/git-rev-list.html index c24cc18c0..010770b79 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1037,13 +1037,26 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim </dt>
<dd>
<p>
- Follow only the first parent commit upon seeing a merge
- commit. This option can give a better overview when
- viewing the evolution of a particular topic branch,
- 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.
+ When finding commits to include, follow only the first
+ parent commit upon seeing a merge commit. This option
+ can give a better overview when viewing the evolution of
+ a particular topic branch, 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.
+</p>
+</dd>
+<dt class="hdlist1">
+--exclude-first-parent-only
+</dt>
+<dd>
+<p>
+ When finding commits to exclude (with a <em>^</em>), follow only
+ the first parent commit upon seeing a merge commit.
+ This can be used to find the set of changes in a topic branch
+ from the point where it diverged from the remote branch, given
+ that arbitrary merges can be valid topic branch changes.
</p>
</dd>
<dt class="hdlist1">
diff --git a/git-shortlog.html b/git-shortlog.html index 064f3dd1c..af3c8b84c 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -1143,13 +1143,26 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim </dt>
<dd>
<p>
- Follow only the first parent commit upon seeing a merge
- commit. This option can give a better overview when
- viewing the evolution of a particular topic branch,
- 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.
+ When finding commits to include, follow only the first
+ parent commit upon seeing a merge commit. This option
+ can give a better overview when viewing the evolution of
+ a particular topic branch, 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.
+</p>
+</dd>
+<dt class="hdlist1">
+--exclude-first-parent-only
+</dt>
+<dd>
+<p>
+ When finding commits to exclude (with a <em>^</em>), follow only
+ the first parent commit upon seeing a merge commit.
+ This can be used to find the set of changes in a topic branch
+ from the point where it diverged from the remote branch, given
+ that arbitrary merges can be valid topic branch changes.
</p>
</dd>
<dt class="hdlist1">
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index ee574d6cd..418ff903e 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -873,7 +873,7 @@ Thanks, <div id="footer">
<div id="footer-text">
Last updated
- 2022-02-16 17:30:07 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 2c6034579..f3b41c420 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
- 2022-02-16 17:30:07 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 3fd23c392..5fb5fc9a8 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
- 2022-02-16 17:30:07 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index dd7b2588c..c43913ead 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
- 2022-02-16 17:30:03 PST
+ 2022-02-17 16:38:46 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 3a84cd310..bf5163f79 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
- 2022-02-16 17:30:07 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index ba32ae6a2..ed4088cf4 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
- 2022-02-16 17:30:07 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 9a6a2fe38..a12d7da4e 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
- 2022-02-16 17:30:06 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 5bf9bdb3e..94282da33 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
- 2022-02-16 17:30:07 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 918b43972..aafc14375 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
- 2022-02-16 17:30:06 PST
+ 2022-02-17 16:38:48 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index b351a9957..a08c17023 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
- 2022-02-16 17:30:03 PST
+ 2022-02-17 16:38:46 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 160df8adf..8b64e4567 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
- 2022-02-16 17:30:05 PST
+ 2022-02-17 16:38:47 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 7ef1866d3..8b8b74263 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
- 2022-02-16 17:30:05 PST
+ 2022-02-17 16:38:47 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 43ac24364..7120dc430 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
- 2022-02-16 17:30:05 PST
+ 2022-02-17 16:38:47 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 5ed0c4216..de4ddf405 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
- 2022-02-16 17:30:04 PST
+ 2022-02-17 16:38:47 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index bd8b41c07..9c69a5a39 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
- 2022-02-16 17:30:04 PST
+ 2022-02-17 16:38:46 PST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 8eb9720c2..c70b669cf 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
- 2022-02-16 17:30:04 PST
+ 2022-02-17 16:38:47 PST
</div>
</div>
</body>
diff --git a/rev-list-options.txt b/rev-list-options.txt index 43a86fa56..fd4f4e26c 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -122,19 +122,27 @@ again. Equivalent forms are `--min-parents=0` (any commit has 0 or more parents) and `--max-parents=-1` (negative numbers denote no upper limit). --first-parent:: - Follow only the first parent commit upon seeing a merge - commit. This option can give a better overview when - viewing the evolution of a particular topic branch, - 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. + When finding commits to include, follow only the first + parent commit upon seeing a merge commit. This option + can give a better overview when viewing the evolution of + a particular topic branch, 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. ifdef::git-log[] + This option also changes default diff format for merge commits to `first-parent`, see `--diff-merges=first-parent` for details. endif::git-log[] +--exclude-first-parent-only:: + When finding commits to exclude (with a '{caret}'), follow only + the first parent commit upon seeing a merge commit. + This can be used to find the set of changes in a topic branch + from the point where it diverged from the remote branch, given + that arbitrary merges can be valid topic branch changes. + --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) for all following revision specifiers, up to the next `--not`. |