diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:48:08 -0800 |
| commit | 11f1df190fcc3ac9c3263a3eba8104cbdee4787d (patch) | |
| tree | d502d6143db9bbb16ca8afac629ff1b4126c9482 | |
| parent | d71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4 (diff) | |
| download | git-htmldocs-11f1df190fcc3ac9c3263a3eba8104cbdee4787d.tar.gz | |
Autogenerated HTML docs for v2.39.1-388-g2fc9e
35 files changed, 180 insertions, 116 deletions
diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt index 01f539ec0..7e6d1171c 100644 --- a/RelNotes/2.40.0.txt +++ b/RelNotes/2.40.0.txt @@ -189,6 +189,14 @@ Fixes since v2.39 enabled, which has been corrected. (merge 06a668cb90 cw/fetch-remote-group-with-duplication later to maint). + * Clarify how "checkout -b/-B" and "git branch [-f]" are similar but + different in the documentation. + (merge fedb8ea2df jc/doc-checkout-b later to maint). + + * "git hash-object" now checks that the resulting object is well + formed with the same code as "git fsck". + (merge 8e4309038f jk/hash-object-fsck later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77e04b2ed4 rs/t4205-do-not-exit-in-test-script later to maint). (merge faebba436e rs/plug-pattern-list-leak-in-lof later to maint). @@ -219,3 +227,5 @@ Fixes since v2.39 (merge dcb47e52b0 en/t6426-todo-cleanup later to maint). (merge 5b8db44bdd jc/format-patch-v-unleak later to maint). (merge 590b636737 jk/hash-object-literally-fd-leak later to maint). + (merge 5458ba0a4d tb/t0003-invoke-dd-more-portably later to maint). + (merge 70661d288b ar/markup-em-dash later to maint). diff --git a/git-apply.html b/git-apply.html index 189a2673c..b4c495cfe 100644 --- a/git-apply.html +++ b/git-apply.html @@ -1081,7 +1081,7 @@ behavior:</p></div> <li>
<p>
<code>fix</code> outputs warnings for a few such errors, and applies the
- patch after fixing them (<code>strip</code> is a synonym --- the tool
+ patch after fixing them (<code>strip</code> is a synonym — the tool
used to consider only trailing whitespace characters as errors, and the
fix involved <em>stripping</em> them, but modern Gits do more).
</p>
@@ -1248,7 +1248,7 @@ subdirectory is checked and (if possible) updated.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
diff --git a/git-apply.txt b/git-apply.txt index 1d478cbe9..5e16e6db7 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -208,7 +208,7 @@ behavior: * `warn` outputs warnings for a few such errors, but applies the patch as-is (default). * `fix` outputs warnings for a few such errors, and applies the - patch after fixing them (`strip` is a synonym --- the tool + patch after fixing them (`strip` is a synonym -- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more). * `error` outputs warnings for a few such errors, and refuses diff --git a/git-checkout.html b/git-checkout.html index 2134d807f..b44448f10 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -944,8 +944,9 @@ of it").</p></div> </dt>
<dd>
<p>
- Create a new branch named <code><new-branch></code> and start it at
- <code><start-point></code>; see <a href="git-branch.html">git-branch(1)</a> for details.
+ Create a new branch named <code><new-branch></code>, start it at
+ <code><start-point></code>, and check the resulting branch out;
+ see <a href="git-branch.html">git-branch(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
@@ -953,10 +954,11 @@ of it").</p></div> </dt>
<dd>
<p>
- Creates the branch <code><new-branch></code> and start it at <code><start-point></code>;
- if it already exists, then reset it to <code><start-point></code>. This is
- equivalent to running "git branch" with "-f"; see
- <a href="git-branch.html">git-branch(1)</a> for details.
+ Creates the branch <code><new-branch></code>, start it at <code><start-point></code>;
+ if it already exists, then reset it to <code><start-point></code>. And then
+ check the resulting branch out. This is equivalent to running
+ "git branch" with "-f" followed by "git checkout" of that branch;
+ see <a href="git-branch.html">git-branch(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
@@ -1633,7 +1635,7 @@ checkout.thresholdForParallelism <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-21 17:52:14 PST
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
diff --git a/git-checkout.txt b/git-checkout.txt index 9f116acdb..6bb32ab46 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -146,14 +146,16 @@ on your side branch as `theirs` (i.e. "one contributor's work on top of it"). -b <new-branch>:: - Create a new branch named `<new-branch>` and start it at - `<start-point>`; see linkgit:git-branch[1] for details. + Create a new branch named `<new-branch>`, start it at + `<start-point>`, and check the resulting branch out; + see linkgit:git-branch[1] for details. -B <new-branch>:: - Creates the branch `<new-branch>` and start it at `<start-point>`; - if it already exists, then reset it to `<start-point>`. This is - equivalent to running "git branch" with "-f"; see - linkgit:git-branch[1] for details. + Creates the branch `<new-branch>`, start it at `<start-point>`; + if it already exists, then reset it to `<start-point>`. And then + check the resulting branch out. This is equivalent to running + "git branch" with "-f" followed by "git checkout" of that branch; + see linkgit:git-branch[1] for details. -t:: --track[=(direct|inherit)]:: diff --git a/git-diff-tree.html b/git-diff-tree.html index 84dfb2579..55c5a454b 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -2637,44 +2637,54 @@ switch line wrapping, like the -w option of </p>
</dd>
<dt class="hdlist1">
-<em>%<(<N>[,trunc|ltrunc|mtrunc])</em>
+<em>%<( <N> [,trunc|ltrunc|mtrunc])</em>
</dt>
<dd>
<p>
make the next placeholder take at
- least N columns, padding spaces on
+ least N column widths, padding spaces on
the right if necessary. Optionally
- truncate at the beginning (ltrunc),
- the middle (mtrunc) or the end
- (trunc) if the output is longer than
- N columns. Note that truncating
+ truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>,
+ the middle (mtrunc) <code>mi..le</code>, or the end
+ (trunc) <code>rig..</code>, if the output is longer than
+ N columns.
+ Note 1: that truncating
only works correctly with N >= 2.
+ Note 2: spaces around the N and M (see below)
+ values are optional.
+ Note 3: Emojis and other wide characters
+ will take two display columns, which may
+ over-run column boundaries.
+ Note 4: decomposed character combining marks
+ may be misplaced at padding boundaries.
</p>
</dd>
<dt class="hdlist1">
-<em>%<|(<N>)</em>
+<em>%<|( <M> )</em>
</dt>
<dd>
<p>
-make the next placeholder take at least until Nth
- columns, padding spaces on the right if necessary
+make the next placeholder take at least until Mth
+ display column, padding spaces on the right if necessary.
+ Use negative M values for column positions measured
+ from the right hand edge of the terminal window.
</p>
</dd>
<dt class="hdlist1">
-<em>%>(<N>)</em>, <em>%>|(<N>)</em>
+<em>%>( <N> )</em>, <em>%>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em> respectively,
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
but padding spaces on the left
</p>
</dd>
<dt class="hdlist1">
-<em>%>>(<N>)</em>, <em>%>>|(<N>)</em>
+<em>%>>( <N> )</em>, <em>%>>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em>
+similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
@@ -2682,11 +2692,11 @@ similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em> </p>
</dd>
<dt class="hdlist1">
-<em>%><(<N>)</em>, <em>%><|(<N>)</em>
+<em>%><( <N> )</em>, <em>%><|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em>
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
respectively, but padding both sides
(i.e. the text is centered)
</p>
diff --git a/git-log.html b/git-log.html index a966c588a..58c9fefb4 100644 --- a/git-log.html +++ b/git-log.html @@ -2753,44 +2753,54 @@ switch line wrapping, like the -w option of </p>
</dd>
<dt class="hdlist1">
-<em>%<(<N>[,trunc|ltrunc|mtrunc])</em>
+<em>%<( <N> [,trunc|ltrunc|mtrunc])</em>
</dt>
<dd>
<p>
make the next placeholder take at
- least N columns, padding spaces on
+ least N column widths, padding spaces on
the right if necessary. Optionally
- truncate at the beginning (ltrunc),
- the middle (mtrunc) or the end
- (trunc) if the output is longer than
- N columns. Note that truncating
+ truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>,
+ the middle (mtrunc) <code>mi..le</code>, or the end
+ (trunc) <code>rig..</code>, if the output is longer than
+ N columns.
+ Note 1: that truncating
only works correctly with N >= 2.
+ Note 2: spaces around the N and M (see below)
+ values are optional.
+ Note 3: Emojis and other wide characters
+ will take two display columns, which may
+ over-run column boundaries.
+ Note 4: decomposed character combining marks
+ may be misplaced at padding boundaries.
</p>
</dd>
<dt class="hdlist1">
-<em>%<|(<N>)</em>
+<em>%<|( <M> )</em>
</dt>
<dd>
<p>
-make the next placeholder take at least until Nth
- columns, padding spaces on the right if necessary
+make the next placeholder take at least until Mth
+ display column, padding spaces on the right if necessary.
+ Use negative M values for column positions measured
+ from the right hand edge of the terminal window.
</p>
</dd>
<dt class="hdlist1">
-<em>%>(<N>)</em>, <em>%>|(<N>)</em>
+<em>%>( <N> )</em>, <em>%>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em> respectively,
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
but padding spaces on the left
</p>
</dd>
<dt class="hdlist1">
-<em>%>>(<N>)</em>, <em>%>>|(<N>)</em>
+<em>%>>( <N> )</em>, <em>%>>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em>
+similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
@@ -2798,11 +2808,11 @@ similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em> </p>
</dd>
<dt class="hdlist1">
-<em>%><(<N>)</em>, <em>%><|(<N>)</em>
+<em>%><( <N> )</em>, <em>%><|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em>
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
respectively, but padding both sides
(i.e. the text is centered)
</p>
diff --git a/git-read-tree.html b/git-read-tree.html index 3d0e35d03..716b1d4e4 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -1056,7 +1056,7 @@ see which of the "local changes" that you made were carried forward by running <code>git diff-index --cached $M</code>. Note that this does not
necessarily match what <code>git diff-index --cached $H</code> would have
produced before such a two tree merge. This is because of cases
-18 and 19 --- if you already had the changes in $M (e.g. maybe
+18 and 19 — if you already had the changes in $M (e.g. maybe
you picked it up via e-mail in a patch form), <code>git diff-index
--cached $H</code> would have told you about the change before this
merge, but it would not show in <code>git diff-index --cached $M</code>
@@ -1294,7 +1294,7 @@ support.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
diff --git a/git-read-tree.txt b/git-read-tree.txt index 7567955ba..b09707474 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -219,7 +219,7 @@ see which of the "local changes" that you made were carried forward by running `git diff-index --cached $M`. Note that this does not necessarily match what `git diff-index --cached $H` would have produced before such a two tree merge. This is because of cases -18 and 19 --- if you already had the changes in $M (e.g. maybe +18 and 19 -- if you already had the changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git diff-index --cached $H` would have told you about the change before this merge, but it would not show in `git diff-index --cached $M` diff --git a/git-rev-list.html b/git-rev-list.html index 3fa41daf3..68c72896e 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -2866,44 +2866,54 @@ switch line wrapping, like the -w option of </p>
</dd>
<dt class="hdlist1">
-<em>%<(<N>[,trunc|ltrunc|mtrunc])</em>
+<em>%<( <N> [,trunc|ltrunc|mtrunc])</em>
</dt>
<dd>
<p>
make the next placeholder take at
- least N columns, padding spaces on
+ least N column widths, padding spaces on
the right if necessary. Optionally
- truncate at the beginning (ltrunc),
- the middle (mtrunc) or the end
- (trunc) if the output is longer than
- N columns. Note that truncating
+ truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>,
+ the middle (mtrunc) <code>mi..le</code>, or the end
+ (trunc) <code>rig..</code>, if the output is longer than
+ N columns.
+ Note 1: that truncating
only works correctly with N >= 2.
+ Note 2: spaces around the N and M (see below)
+ values are optional.
+ Note 3: Emojis and other wide characters
+ will take two display columns, which may
+ over-run column boundaries.
+ Note 4: decomposed character combining marks
+ may be misplaced at padding boundaries.
</p>
</dd>
<dt class="hdlist1">
-<em>%<|(<N>)</em>
+<em>%<|( <M> )</em>
</dt>
<dd>
<p>
-make the next placeholder take at least until Nth
- columns, padding spaces on the right if necessary
+make the next placeholder take at least until Mth
+ display column, padding spaces on the right if necessary.
+ Use negative M values for column positions measured
+ from the right hand edge of the terminal window.
</p>
</dd>
<dt class="hdlist1">
-<em>%>(<N>)</em>, <em>%>|(<N>)</em>
+<em>%>( <N> )</em>, <em>%>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em> respectively,
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
but padding spaces on the left
</p>
</dd>
<dt class="hdlist1">
-<em>%>>(<N>)</em>, <em>%>>|(<N>)</em>
+<em>%>>( <N> )</em>, <em>%>>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em>
+similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
@@ -2911,11 +2921,11 @@ similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em> </p>
</dd>
<dt class="hdlist1">
-<em>%><(<N>)</em>, <em>%><|(<N>)</em>
+<em>%><( <N> )</em>, <em>%><|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em>
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
respectively, but padding both sides
(i.e. the text is centered)
</p>
diff --git a/git-show.html b/git-show.html index 25038a1fd..d5d3d4c77 100644 --- a/git-show.html +++ b/git-show.html @@ -1213,44 +1213,54 @@ switch line wrapping, like the -w option of </p>
</dd>
<dt class="hdlist1">
-<em>%<(<N>[,trunc|ltrunc|mtrunc])</em>
+<em>%<( <N> [,trunc|ltrunc|mtrunc])</em>
</dt>
<dd>
<p>
make the next placeholder take at
- least N columns, padding spaces on
+ least N column widths, padding spaces on
the right if necessary. Optionally
- truncate at the beginning (ltrunc),
- the middle (mtrunc) or the end
- (trunc) if the output is longer than
- N columns. Note that truncating
+ truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>,
+ the middle (mtrunc) <code>mi..le</code>, or the end
+ (trunc) <code>rig..</code>, if the output is longer than
+ N columns.
+ Note 1: that truncating
only works correctly with N >= 2.
+ Note 2: spaces around the N and M (see below)
+ values are optional.
+ Note 3: Emojis and other wide characters
+ will take two display columns, which may
+ over-run column boundaries.
+ Note 4: decomposed character combining marks
+ may be misplaced at padding boundaries.
</p>
</dd>
<dt class="hdlist1">
-<em>%<|(<N>)</em>
+<em>%<|( <M> )</em>
</dt>
<dd>
<p>
-make the next placeholder take at least until Nth
- columns, padding spaces on the right if necessary
+make the next placeholder take at least until Mth
+ display column, padding spaces on the right if necessary.
+ Use negative M values for column positions measured
+ from the right hand edge of the terminal window.
</p>
</dd>
<dt class="hdlist1">
-<em>%>(<N>)</em>, <em>%>|(<N>)</em>
+<em>%>( <N> )</em>, <em>%>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em> respectively,
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em> respectively,
but padding spaces on the left
</p>
</dd>
<dt class="hdlist1">
-<em>%>>(<N>)</em>, <em>%>>|(<N>)</em>
+<em>%>>( <N> )</em>, <em>%>>|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em>
+similar to <em>%>( <N> )</em>, <em>%>|( <M> )</em>
respectively, except that if the next
placeholder takes more spaces than given and
there are spaces on its left, use those
@@ -1258,11 +1268,11 @@ similar to <em>%>(<N>)</em>, <em>%>|(<N>)</em> </p>
</dd>
<dt class="hdlist1">
-<em>%><(<N>)</em>, <em>%><|(<N>)</em>
+<em>%><( <N> )</em>, <em>%><|( <M> )</em>
</dt>
<dd>
<p>
-similar to <em>%<(<N>)</em>, <em>%<|(<N>)</em>
+similar to <em>%<( <N> )</em>, <em>%<|( <M> )</em>
respectively, but padding both sides
(i.e. the text is centered)
</p>
@@ -3121,7 +3121,7 @@ are the octal representation of the file modes. (e.g. <code>new-file</code> in "git-diff-files"), <code>/dev/null</code> (e.g. <code>old-file</code>
when a new file is added), or a temporary file (e.g. <code>old-file</code> in the
index). <code>GIT_EXTERNAL_DIFF</code> should not worry about unlinking the
-temporary file --- it is removed when <code>GIT_EXTERNAL_DIFF</code> exits.</p></div>
+temporary file — it is removed when <code>GIT_EXTERNAL_DIFF</code> exits.</p></div>
<div class="paragraph"><p>For a path that is unmerged, <code>GIT_EXTERNAL_DIFF</code> is called with 1
parameter, <path>.</p></div>
<div class="paragraph"><p>For each path <code>GIT_EXTERNAL_DIFF</code> is called, two environment variables,
@@ -3796,7 +3796,7 @@ the Git Security mailing list <<a href="mailto:git-security@googlegroups.com" <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-04 22:32:44 PST
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
@@ -613,7 +613,7 @@ The file parameters can point at the user's working file (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the -temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits. +temporary file -- it is removed when `GIT_EXTERNAL_DIFF` exits. + For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>. diff --git a/gitformat-signature.html b/gitformat-signature.html index 27d7e5650..3237135b6 100644 --- a/gitformat-signature.html +++ b/gitformat-signature.html @@ -778,7 +778,7 @@ line.</p></div> <div class="paragraph"><p>This is even true for an originally empty line. In the following
examples, the end of line that ends with a whitespace letter is
highlighted with a <code>$</code> sign; if you are trying to recreate these
-example by hand, do not cut and paste them---they are there
+example by hand, do not cut and paste them—they are there
primarily to highlight extra whitespace at the end of some lines.</p></div>
<div class="paragraph"><p>The signed payload and the way the signature is embedded depends
on the type of the object resp. transaction.</p></div>
@@ -1035,7 +1035,7 @@ Date: Wed Jun 15 09:13:29 2016 +0000 <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
diff --git a/gitformat-signature.txt b/gitformat-signature.txt index a249869fa..d8e3eb1ba 100644 --- a/gitformat-signature.txt +++ b/gitformat-signature.txt @@ -37,7 +37,7 @@ line. This is even true for an originally empty line. In the following examples, the end of line that ends with a whitespace letter is highlighted with a `$` sign; if you are trying to recreate these -example by hand, do not cut and paste them---they are there +example by hand, do not cut and paste them--they are there primarily to highlight extra whitespace at the end of some lines. The signed payload and the way the signature is embedded depends diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 731cfb1b4..00356db70 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -1038,7 +1038,7 @@ Thanks, <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-27 09:45:09 PST
+ 2023-01-30 14:46:00 PST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 367a1e8a6..c5754d12c 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
- 2023-01-27 09:45:09 PST
+ 2023-01-30 14:45:59 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index a533844d8..6d8d39ee3 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-27 09:45:09 PST
+ 2023-01-30 14:46:00 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index 304dce106..80a2b67e9 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
- 2023-01-27 09:45:07 PST
+ 2023-01-30 14:45:55 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index a6a541d0a..dffa600a2 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
- 2023-01-27 09:45:09 PST
+ 2023-01-30 14:45:59 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 07010b44b..03d0a8394 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
- 2023-01-27 09:45:09 PST
+ 2023-01-30 14:45:59 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 4fa6ceff8..46519d812 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
- 2023-01-27 09:45:08 PST
+ 2023-01-30 14:45:58 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index c3fb2af0f..d0716fc65 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
- 2023-01-27 09:45:08 PST
+ 2023-01-30 14:45:59 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index ae421ab8f..613f4da15 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
- 2023-01-27 09:45:08 PST
+ 2023-01-30 14:45:58 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index dda9a6424..84afb2659 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
- 2023-01-27 09:45:07 PST
+ 2023-01-30 14:45:56 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 79af5c4d6..ae81daceb 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
- 2023-01-27 09:45:08 PST
+ 2023-01-30 14:45:58 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 53111c3ca..7f560e01f 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
- 2023-01-27 09:45:08 PST
+ 2023-01-30 14:45:57 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 56ec3851a..465ef6ec2 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
- 2023-01-27 09:45:08 PST
+ 2023-01-30 14:45:57 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index edb8b73d9..a922df97e 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
- 2023-01-27 09:45:07 PST
+ 2023-01-30 14:45:57 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index bee3d55b2..074a8f28c 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
- 2023-01-27 09:45:07 PST
+ 2023-01-30 14:45:56 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 a0965d3d6..0cbd88b76 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
- 2023-01-27 09:45:07 PST
+ 2023-01-30 14:45:56 PST
</div>
</div>
</body>
diff --git a/pretty-formats.txt b/pretty-formats.txt index 0b4c1c8d9..3b7133445 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt @@ -146,24 +146,34 @@ The placeholders are: '%m':: left (`<`), right (`>`) or boundary (`-`) mark '%w([<w>[,<i1>[,<i2>]]])':: switch line wrapping, like the -w option of linkgit:git-shortlog[1]. -'%<(<N>[,trunc|ltrunc|mtrunc])':: make the next placeholder take at - least N columns, padding spaces on +'%<( <N> [,trunc|ltrunc|mtrunc])':: make the next placeholder take at + least N column widths, padding spaces on the right if necessary. Optionally - truncate at the beginning (ltrunc), - the middle (mtrunc) or the end - (trunc) if the output is longer than - N columns. Note that truncating + truncate (with ellipsis '..') at the left (ltrunc) `..ft`, + the middle (mtrunc) `mi..le`, or the end + (trunc) `rig..`, if the output is longer than + N columns. + Note 1: that truncating only works correctly with N >= 2. -'%<|(<N>)':: make the next placeholder take at least until Nth - columns, padding spaces on the right if necessary -'%>(<N>)', '%>|(<N>)':: similar to '%<(<N>)', '%<|(<N>)' respectively, + Note 2: spaces around the N and M (see below) + values are optional. + Note 3: Emojis and other wide characters + will take two display columns, which may + over-run column boundaries. + Note 4: decomposed character combining marks + may be misplaced at padding boundaries. +'%<|( <M> )':: make the next placeholder take at least until Mth + display column, padding spaces on the right if necessary. + Use negative M values for column positions measured + from the right hand edge of the terminal window. +'%>( <N> )', '%>|( <M> )':: similar to '%<( <N> )', '%<|( <M> )' respectively, but padding spaces on the left -'%>>(<N>)', '%>>|(<N>)':: similar to '%>(<N>)', '%>|(<N>)' +'%>>( <N> )', '%>>|( <M> )':: similar to '%>( <N> )', '%>|( <M> )' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces -'%><(<N>)', '%><|(<N>)':: similar to '%<(<N>)', '%<|(<N>)' +'%><( <N> )', '%><|( <M> )':: similar to '%<( <N> )', '%<|( <M> )' respectively, but padding both sides (i.e. the text is centered) diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 1874731c0..44a9e0241 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -1616,7 +1616,7 @@ hash re-encode during clone and to encourage peers to modernize.</p></div> <div class="paragraph"><p>The design described here allows fetches by SHA-1 clients of a
personal SHA-256 repository because it’s not much more difficult than
allowing pushes from that repository. This support needs to be guarded
-by a configuration option --- servers like git.kernel.org that serve a
+by a configuration option — servers like git.kernel.org that serve a
large number of clients would not be expected to bear that cost.</p></div>
</div>
<div class="sect2">
@@ -2087,7 +2087,7 @@ See the history of this file in git.git for the history of subsequent <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-01-30 14:44:53 PST
</div>
</div>
</body>
diff --git a/technical/hash-function-transition.txt b/technical/hash-function-transition.txt index e2ac36dd2..ed5748108 100644 --- a/technical/hash-function-transition.txt +++ b/technical/hash-function-transition.txt @@ -562,7 +562,7 @@ hash re-encode during clone and to encourage peers to modernize. The design described here allows fetches by SHA-1 clients of a personal SHA-256 repository because it's not much more difficult than allowing pushes from that repository. This support needs to be guarded -by a configuration option --- servers like git.kernel.org that serve a +by a configuration option -- servers like git.kernel.org that serve a large number of clients would not be expected to bear that cost. Meaning of signatures diff --git a/technical/rerere.txt b/technical/rerere.txt index 35d454143..be58f1bee 100644 --- a/technical/rerere.txt +++ b/technical/rerere.txt @@ -99,7 +99,7 @@ conflict to leave line D means that the user declares: compatible with what AB and AC wanted to do. So the conflict we would see when merging AB into ACAB should be -resolved the same way---it is the resolution that is in line with that +resolved the same way--it is the resolution that is in line with that declaration. Imagine that similarly previously a branch XYXZ was forked from XY, |