diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.30.0.txt | 22 | ||||
| -rw-r--r-- | Documentation/git-maintenance.txt | 2 | ||||
| -rw-r--r-- | Documentation/git.txt | 4 | ||||
| -rw-r--r-- | Documentation/pretty-formats.txt | 34 |
4 files changed, 35 insertions, 27 deletions
diff --git a/Documentation/RelNotes/2.30.0.txt b/Documentation/RelNotes/2.30.0.txt index 0190fa6315..c2f1dc7b06 100644 --- a/Documentation/RelNotes/2.30.0.txt +++ b/Documentation/RelNotes/2.30.0.txt @@ -81,8 +81,8 @@ UI, Workflows & Features * "git update-ref --stdin" learns to take multiple transactions in a single session. - * Various subcommands of "git config" that takes value_regex - learn the "--literal-value" option to take the value_regex option + * Various subcommands of "git config" that take value_regex + learned the "--literal-value" option to take the value_regex option as a literal string. * The transport layer was taught to optionally exchange the session @@ -120,11 +120,11 @@ Performance, Internal Implementation, Development Support etc. test pieces to run. * Adjust tests so that they won't scream when the default initial - branch name is changed to 'main'. + branch name is different from 'master'. * Rewriting "git bisect" in C continues. - * More preliminary tests have been added to document desired outcome + * More preliminary tests have been added to document desired outcomes of various "directory rename" situations. * Micro clean-up of a couple of test scripts. @@ -136,9 +136,6 @@ Performance, Internal Implementation, Development Support etc. * The code to detect premature EOF in the sideband demultiplexer has been cleaned up. - * Test scripts are being prepared to transition of the default branch - name to 'main'. - * "git fetch --depth=<n>" over the stateless RPC / smart HTTP transport handled EOF from the client poorly at the server end. @@ -252,7 +249,7 @@ Fixes since v2.29 (merge c779386182 jc/sequencer-stopped-sha-simplify later to maint). * The code to see if "git stash drop" can safely remove refs/stash - has been made more carerful. + has been made more careful. (merge 4f44c5659b rs/empty-reflog-check-fix later to maint). * "git log -L<range>:<path>" is documented to take no pathspec, but @@ -299,7 +296,7 @@ Fixes since v2.29 (merge 81c4c5cf2e jk/4gb-idx later to maint). * Since jgit does not yet work with SHA-256 repositories, mark the - tests that uses it not to run unless we are testing with ShA-1 + tests that use it not to run unless we are testing with ShA-1 repositories. (merge ea699b4adc sg/t5310-jgit-wants-sha1 later to maint). @@ -337,7 +334,7 @@ Fixes since v2.29 (merge 506ec2fbda tb/idx-midx-race-fix later to maint). * "git apply" adjusted the permission bits of working-tree files and - directories according core.sharedRepository setting by mistake and + directories according to core.sharedRepository setting by mistake and for a long time, which has been corrected. (merge eb3c027e17 mt/do-not-use-scld-in-working-tree later to maint). @@ -363,6 +360,10 @@ Fixes since v2.29 * Tighten error checking in the codepath that responds to "git fetch". (merge d43a21bdbb jk/check-config-parsing-error-in-upload-pack later to maint). + * "git pack-redundant" when there is only one packfile used to crash, + which has been corrected. + (merge 0696232390 jx/pack-redundant-on-single-pack later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint). (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint). @@ -397,3 +398,4 @@ Fixes since v2.29 (merge 56f56ac50b ab/unreachable-break later to maint). (merge 731d578b4f rb/nonstop-config-mak-uname-update later to maint). (merge f4698738f9 es/perf-export-fix later to maint). + (merge 773c694142 nk/refspecs-negative-fix later to maint). diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt index 6fec1eb8dc..d1f9b5172d 100644 --- a/Documentation/git-maintenance.txt +++ b/Documentation/git-maintenance.txt @@ -101,7 +101,7 @@ This is done to avoid disrupting the remote-tracking branches. The end users expect these refs to stay unmoved unless they initiate a fetch. With prefetch task, however, the objects necessary to complete a later real fetch would already be obtained, so the real fetch would go faster. In the ideal case, -it will just become an update to bunch of remote-tracking branches without +it will just become an update to a bunch of remote-tracking branches without any object transfer. gc:: diff --git a/Documentation/git.txt b/Documentation/git.txt index c463b937a8..a6d4ad0818 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -609,8 +609,8 @@ other `GIT_SEQUENCE_EDITOR`:: This environment variable overrides the configured Git editor when editing the todo list of an interactive rebase. See also - linkit::git-rebase[1] and the `sequence.editor` option in - linkit::git-config[1]. + linkgit:git-rebase[1] and the `sequence.editor` option in + linkgit:git-config[1]. `GIT_SSH`:: `GIT_SSH_COMMAND`:: diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 84bbc7439a..6b59e28d44 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -252,7 +252,15 @@ endif::git-rev-list[] interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon - and zero or more comma-separated options: + and zero or more comma-separated options. + If any option is provided multiple times the + last occurance wins. ++ +The boolean options accept an optional value `[=<BOOL>]`. The values +`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean" +sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean +option is given with no value, it's enabled. ++ ** 'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are @@ -261,27 +269,25 @@ endif::git-rev-list[] desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`. -** 'only[=val]': select whether non-trailer lines from the trailer - block should be included. The `only` keyword may optionally be - followed by an equal sign and one of `true`, `on`, `yes` to omit or - `false`, `off`, `no` to show the non-trailer lines. If option is - given without value it is enabled. If given multiple times the last - value is used. +** 'only[=<BOOL>]': select whether non-trailer lines from the trailer + block should be included. ** 'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as - next option. If separator option is given multiple times only the - last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` + next option. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is "Ticket" separated by a comma and a space. -** 'unfold[=val]': make it behave as if interpret-trailer's `--unfold` - option was given. In same way as to for `only` it can be followed - by an equal sign and explicit value. E.g., +** 'unfold[=<BOOL>]': make it behave as if interpret-trailer's `--unfold` + option was given. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines. -** 'valueonly[=val]': skip over the key part of the trailer line and only - show the value part. Also this optionally allows explicit value. +** 'keyonly[=<BOOL>]': only show the key part of the trailer. +** 'valueonly[=<BOOL>]': only show the value part of the trailer. +** 'key_value_separator=<SEP>': specify a separator inserted between + trailer lines. When this option is not given each trailer key-value + pair is separated by ": ". Otherwise it shares the same semantics + as 'separator=<SEP>' above. NOTE: Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will |