diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-05-22 21:10:51 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-22 21:10:51 +0900 |
commit | 921b9fd7b402da06e7370c11491a9fc30b0013ff (patch) | |
tree | de44bc62ed602790ec10d71e122e064dbe12ef90 | |
parent | 6efe282375a8e498caee44e50d8fe31f38f1e402 (diff) | |
download | git-htmldocs-921b9fd7b402da06e7370c11491a9fc30b0013ff.tar.gz |
Autogenerated HTML docs for v2.32.0-rc1
-rw-r--r-- | RelNotes/2.32.0.txt | 5 | ||||
-rw-r--r-- | SubmittingPatches.html | 2 | ||||
-rw-r--r-- | git-config.html | 6 | ||||
-rw-r--r-- | git-stash.html | 8 | ||||
-rw-r--r-- | git-stash.txt | 6 | ||||
-rw-r--r-- | howto-index.html | 2 | ||||
-rw-r--r-- | howto/coordinate-embargoed-releases.html | 2 | ||||
-rw-r--r-- | howto/keep-canonical-history-correct.html | 2 | ||||
-rw-r--r-- | howto/maintain-git.html | 2 | ||||
-rw-r--r-- | howto/new-command.html | 2 | ||||
-rw-r--r-- | howto/rebase-from-internal-branch.html | 2 | ||||
-rw-r--r-- | howto/rebuild-from-update-hook.html | 2 | ||||
-rw-r--r-- | howto/recover-corrupted-blob-object.html | 2 | ||||
-rw-r--r-- | howto/recover-corrupted-object-harder.html | 2 | ||||
-rw-r--r-- | howto/revert-a-faulty-merge.html | 2 | ||||
-rw-r--r-- | howto/revert-branch-rebase.html | 2 | ||||
-rw-r--r-- | howto/separating-topic-branches.html | 2 | ||||
-rw-r--r-- | howto/setup-git-server-over-http.html | 2 | ||||
-rw-r--r-- | howto/update-hook-example.html | 2 | ||||
-rw-r--r-- | howto/use-git-daemon.html | 2 | ||||
-rw-r--r-- | howto/using-merge-subtree.html | 2 | ||||
-rw-r--r-- | howto/using-signed-tag-in-pull-request.html | 2 | ||||
-rw-r--r-- | technical/api-index.html | 2 |
23 files changed, 36 insertions, 27 deletions
diff --git a/RelNotes/2.32.0.txt b/RelNotes/2.32.0.txt index ed590a7b5..87d56fa1a 100644 --- a/RelNotes/2.32.0.txt +++ b/RelNotes/2.32.0.txt @@ -385,6 +385,11 @@ Fixes since v2.31 to help running tests that the developer has not modified. (merge 2d86a96220 jk/test-chainlint-softer later to maint). + * The "rev-parse" command did not diagnose the lack of argument to + "--path-format" option, which was introduced in v2.31 era, which + has been corrected. + (merge 99fc555188 wm/rev-parse-path-format-wo-arg later to maint). + * Other code cleanup, docfix, build fix, etc. (merge f451960708 dl/cat-file-doc-cleanup later to maint). (merge 12604a8d0c sv/t9801-test-path-is-file-cleanup later to maint). diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 50f5abb27..569d9ff7d 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -1396,7 +1396,7 @@ this problem around.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-05-17 06:38:06 JST
+ 2021-05-22 21:08:31 JST
</div>
</div>
</body>
diff --git a/git-config.html b/git-config.html index 205ba5f58..a5de1fa78 100644 --- a/git-config.html +++ b/git-config.html @@ -9568,9 +9568,9 @@ stash.showIncludeUntracked </dt>
<dd>
<p>
- If this is set to true, the <code>git stash show</code> command without an
- option will show the untracked files of a stash entry. Defaults to
- false. See description of <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
+ If this is set to true, the <code>git stash show</code> command will show
+ the untracked files of a stash entry. Defaults to false. See
+ description of <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
</p>
</dd>
<dt class="hdlist1">
diff --git a/git-stash.html b/git-stash.html index d95469df2..1d9cade35 100644 --- a/git-stash.html +++ b/git-stash.html @@ -848,8 +848,10 @@ show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash By default, the command shows the diffstat, but it will accept any
format known to <em>git diff</em> (e.g., <code>git stash show -p stash@{1}</code>
to view the second most recent entry in patch form).
- You can use stash.showIncludeUntracked, stash.showStat, and
- stash.showPatch config variables to change the default behavior.
+ If no <code><diff-option></code> is provided, the default behavior will be given
+ by the <code>stash.showStat</code>, and <code>stash.showPatch</code> config variables. You
+ can also use <code>stash.showIncludeUntracked</code> to set whether
+ <code>--include-untracked</code> is enabled by default.
</p>
</dd>
<dt class="hdlist1">
@@ -1245,7 +1247,7 @@ xargs git log --merges --no-walk --grep=WIP</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2021-03-23 06:17:33 JST
+ 2021-05-22 21:08:23 JST
</div>
</div>
</body>
diff --git a/git-stash.txt b/git-stash.txt index a8c8c32f1..be6084cce 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -91,8 +91,10 @@ show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]:: By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). - You can use stash.showIncludeUntracked, stash.showStat, and - stash.showPatch config variables to change the default behavior. + If no `<diff-option>` is provided, the default behavior will be given + by the `stash.showStat`, and `stash.showPatch` config variables. You + can also use `stash.showIncludeUntracked` to set whether + `--include-untracked` is enabled by default. pop [--index] [-q|--quiet] [<stash>]:: diff --git a/howto-index.html b/howto-index.html index 1ecff7980..9543a8645 100644 --- a/howto-index.html +++ b/howto-index.html @@ -894,7 +894,7 @@ later validate it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-05-17 06:38:00 JST
+ 2021-05-22 21:08:25 JST
</div>
</div>
</body>
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index a488ca427..32970d76e 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
- 2021-05-21 12:36:30 JST
+ 2021-05-22 21:08:30 JST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index e90e30b1f..c74fe558d 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
- 2021-05-21 12:36:30 JST
+ 2021-05-22 21:08:29 JST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index f8837a84f..a52ed82c7 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
- 2021-05-21 12:36:30 JST
+ 2021-05-22 21:08:30 JST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index ae140b34f..18e846f5c 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
- 2021-05-21 12:36:26 JST
+ 2021-05-22 21:08:27 JST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 0d7cae585..a4cdf06f7 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
- 2021-05-21 12:36:30 JST
+ 2021-05-22 21:08:29 JST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 53b29923c..a5cc175a5 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
- 2021-05-21 12:36:30 JST
+ 2021-05-22 21:08:29 JST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index a6d4f97cc..3cfa38911 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
- 2021-05-21 12:36:29 JST
+ 2021-05-22 21:08:29 JST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 6b90dcd50..c4f702863 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
- 2021-05-21 12:36:30 JST
+ 2021-05-22 21:08:29 JST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index fdab05eb1..7eabb110a 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
- 2021-05-21 12:36:29 JST
+ 2021-05-22 21:08:29 JST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index fbd7c3969..a1836049f 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
- 2021-05-21 12:36:27 JST
+ 2021-05-22 21:08:27 JST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index d4f44015d..12275c8aa 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
- 2021-05-21 12:36:29 JST
+ 2021-05-22 21:08:28 JST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 2902a828e..075aed04a 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
- 2021-05-21 12:36:28 JST
+ 2021-05-22 21:08:28 JST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 48aca4ec7..b9cb3bc40 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
- 2021-05-21 12:36:28 JST
+ 2021-05-22 21:08:28 JST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index d71ddc094..ea630e130 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
- 2021-05-21 12:36:28 JST
+ 2021-05-22 21:08:28 JST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 5a0afcfad..764dad37e 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
- 2021-05-21 12:36:27 JST
+ 2021-05-22 21:08:27 JST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 5441040e2..b5e94c017 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
- 2021-05-21 12:36:27 JST
+ 2021-05-22 21:08:27 JST
</div>
</div>
</body>
diff --git a/technical/api-index.html b/technical/api-index.html index 28a39c067..5c1b4cb35 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -775,7 +775,7 @@ documents them.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-05-17 06:38:10 JST
+ 2021-05-22 21:08:35 JST
</div>
</div>
</body>
|