Sync with 'master'
Junio C Hamano
commit
c7ae2d5bb8
|
|
@ -688,7 +688,7 @@ For C programs:
|
|||
walk_dog(dog[1]);
|
||||
|
||||
Cases where the array is employed as a whole rather than as its unit parts,
|
||||
the plural forms is preferable. E.g:
|
||||
the plural form is preferable. E.g:
|
||||
|
||||
char *dogs[] = ...;
|
||||
walk_all_dogs(dogs);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ UI, Workflows & Features
|
|||
* Extend the alias configuration syntax to allow aliases using
|
||||
characters outside ASCII alphanumeric (plus '-').
|
||||
|
||||
* A signature on a commit that was GPG signed long time ago ought to
|
||||
* A signature on a commit that was GPG signed a long time ago ought to
|
||||
be still valid after the key that was used to sign it has expired,
|
||||
but we showed them in alarming red.
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ UI, Workflows & Features
|
|||
* "git repo structure" command learns to report maximum values on
|
||||
various aspects of objects it inspects.
|
||||
|
||||
* "git rebase" learns "--trailer" command to drive the
|
||||
* "git rebase" learns "--trailer" option to drive the
|
||||
interpret-trailers machinery.
|
||||
|
||||
* "git fast-import" learned to optionally replace signature on
|
||||
|
|
@ -119,7 +119,7 @@ UI, Workflows & Features
|
|||
* "git replay" (experimental) learns, in addition to "pick" and
|
||||
"replay", a new operating mode "revert".
|
||||
|
||||
* git replay now supports replaying down to the root commit.
|
||||
* "git replay" now supports replaying down to the root commit.
|
||||
|
||||
* Handling of signed commits and tags in fast-import has been made more
|
||||
configurable.
|
||||
|
|
@ -207,7 +207,7 @@ Performance, Internal Implementation, Development Support etc.
|
|||
from getting added.
|
||||
|
||||
* The core.attributesfile is intended to be set per repository, but
|
||||
were kept track of by a single global variable in-core, which has
|
||||
was kept track of by a single global variable in-core, which has
|
||||
been corrected by moving it to per-repository data structure.
|
||||
|
||||
* Use the hook API to replace ad-hoc invocation of hook scripts via
|
||||
|
|
@ -232,8 +232,8 @@ Performance, Internal Implementation, Development Support etc.
|
|||
* Reduce dependence on the global the_hash_algo and the_repository
|
||||
variables of wt-status code path.
|
||||
|
||||
* The way combined list-object filter options are parsed has been
|
||||
revamped.
|
||||
* The way combined list-object filter options are parsed has been
|
||||
revamped.
|
||||
|
||||
* Editorconfig filename patterns were specified incorrectly, making
|
||||
many source files inside subdirectories unaffected, which has been
|
||||
|
|
@ -272,7 +272,7 @@ Performance, Internal Implementation, Development Support etc.
|
|||
* split-index.c has been updated to not use the global the_repository
|
||||
and the_hash_algo variables.
|
||||
|
||||
* The unsigned integer that is used as an bitset to specify the kind
|
||||
* The unsigned integer that is used as a bitset to specify the kind
|
||||
of branches interpret_branch_name() function has been changed to
|
||||
use a dedicated enum type.
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ Performance, Internal Implementation, Development Support etc.
|
|||
* Code paths that loop over another array to push each element into a
|
||||
strvec have been rewritten to use strvec_pushv() instead.
|
||||
|
||||
* In case homebrew breaks REG_ENHANCED again, leave a in-code comment
|
||||
* In case homebrew breaks REG_ENHANCED again, leave an in-code comment
|
||||
to suggest use of our replacement regex as a workaround.
|
||||
|
||||
* MinGW build updates.
|
||||
|
|
@ -382,7 +382,7 @@ Fixes since v2.53
|
|||
(merge f4eff7116d ps/pack-concat-wo-backfill later to maint).
|
||||
|
||||
* "git switch <name>", in an attempt to create a local branch <name>
|
||||
after a remote tracking branch of the same name gave an advise
|
||||
after a remote tracking branch of the same name gave an advice
|
||||
message to disambiguate using "git checkout", which has been
|
||||
updated to use "git switch".
|
||||
(merge 12fee11f21 jc/checkout-switch-restore later to maint).
|
||||
|
|
@ -396,7 +396,7 @@ Fixes since v2.53
|
|||
* "git format-patch --from=<me>" did not honor the command line
|
||||
option when writing out the cover letter, which has been corrected.
|
||||
|
||||
* Update build precedure for mergetool documentation in meson-based builds.
|
||||
* Update build procedure for mergetool documentation in meson-based builds.
|
||||
(merge 58e4eeeeb5 pw/meson-doc-mergetool later to maint).
|
||||
|
||||
* An earlier attempt to optimize "git subtree" discarded too much
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ pack.usePathWalk::
|
|||
|
||||
pack.preferBitmapTips::
|
||||
Specifies a ref hierarchy (e.g., "refs/heads/"); can be
|
||||
given multiple times to specify more than one hierarchies.
|
||||
given multiple times to specify more than one hierarchy.
|
||||
When selecting which commits will receive bitmaps, prefer a
|
||||
commit at the tip of a reference that is contained in any of
|
||||
the configured hierarchies.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ sendemail.smtpSSLClientCert::
|
|||
sendemail.smtpSSLClientKey::
|
||||
Path to the client private key file that corresponds to the client
|
||||
certificate. To avoid misconfiguration, this configuration must be used
|
||||
in conjunction with `sendemail.smtpSSLClientKey` or the
|
||||
in conjunction with `sendemail.smtpSSLClientCert` or the
|
||||
`--smtp-ssl-client-cert` option. If the client key is included in the
|
||||
client certificate, the choice of private key depends on the format of
|
||||
the certificate. Visit https://metacpan.org/pod/IO::Socket::SSL for more
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ submodule.<name>.ignore::
|
|||
takes only differences between the HEAD of the submodule and the commit
|
||||
recorded in the superproject into account. "untracked" will additionally
|
||||
let submodules with modified tracked files in their work tree show up.
|
||||
When set to "none"(default) It also show submodules as changed if they have
|
||||
When set to "none" (default) it also shows submodules as changed if they have
|
||||
untracked files in their work tree.
|
||||
This setting overrides any setting made in .gitmodules for this submodule,
|
||||
both settings can be overridden on the command line by using the
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ will automatically invoke this command.
|
|||
'forget' <pathspec>::
|
||||
|
||||
Reset the conflict resolutions which rerere has recorded for the current
|
||||
conflict in paths that match <pathspec>.
|
||||
conflicts in paths that match <pathspec>.
|
||||
|
||||
'diff'::
|
||||
|
||||
|
|
|
|||
|
|
@ -70,10 +70,10 @@ submodule.<name>.ignore::
|
|||
--
|
||||
all;; The submodule will never be considered modified (but will
|
||||
nonetheless show up in the output of status and commit when it has
|
||||
been staged). Add `(new commits)` can be overruled using the
|
||||
`git add --force <submodule.path>`.
|
||||
The setting affects `status`, `update-index`, `diff` and `log`(due
|
||||
to underlaying `diff`).
|
||||
been staged). Adding a submodule with `(new commits)` can be
|
||||
overridden using `git add --force <submodule.path>`.
|
||||
This setting affects `status`, `update-index`, `diff` and `log`
|
||||
(due to underlying `diff`).
|
||||
|
||||
dirty;; All changes to the submodule's work tree will be ignored, only
|
||||
committed differences between the `HEAD` of the submodule and its
|
||||
|
|
|
|||
Loading…
Reference in New Issue