diff --git a/RelNotes/2.53.0.adoc b/RelNotes/2.53.0.adoc index f28c82029..34216a59f 100644 --- a/RelNotes/2.53.0.adoc +++ b/RelNotes/2.53.0.adoc @@ -184,3 +184,7 @@ Fixes since v2.52 (merge fddba8f737 ja/doc-synopsis-style later to maint). (merge 22ce0cb639 en/xdiff-cleanup-2 later to maint). (merge 8ef7355a8f je/doc-pull later to maint). + (merge 48176f953f jc/capability-leak later to maint). + (merge 8cbbdc92f7 kh/doc-pre-commit-fix later to maint). + (merge d4bc39a4d9 mh/doc-config-gui-gcwarning later to maint). + (merge 41d425008a kh/doc-send-email-paragraph-fix later to maint). diff --git a/git-config.html b/git-config.html index 47ee00275..2012bae9f 100644 --- a/git-config.html +++ b/git-config.html @@ -5732,6 +5732,12 @@

Variables

Context menu item is invoked from git gui blame. If this variable is set to zero, the whole history is shown.

+
gui.GCWarning
+
+

Determines whether git-gui(1) should prompt for garbage +collection when git detects a large number of loose objects in +the repository. The default value is "true".

+
guitool.<name>.cmd

Specifies the shell command line to execute when the corresponding item @@ -10092,7 +10098,7 @@

GIT

diff --git a/git-send-email.adoc b/git-send-email.adoc index 263b97735..688efe278 100644 --- a/git-send-email.adoc +++ b/git-send-email.adoc @@ -321,7 +321,6 @@ for instructions. If disabled with `--no-use-imap-only`, the emails will be sent like usual. Disabled by default, but the `sendemail.useImapOnly` configuration variable can be used to enable it. - + This feature requires setting up `git imap-send`. See linkgit:git-imap-send[1] for instructions. diff --git a/githooks.adoc b/githooks.adoc index 0397dec64..056553788 100644 --- a/githooks.adoc +++ b/githooks.adoc @@ -103,17 +103,14 @@ invoked before obtaining the proposed commit log message and making a commit. Exiting with a non-zero status from this script causes the `git commit` command to abort before creating a commit. -The default 'pre-commit' hook, when enabled, catches introduction -of lines with trailing whitespaces and aborts the commit when -such a line is found. - All the `git commit` hooks are invoked with the environment variable `GIT_EDITOR=:` if the command will not bring up an editor to modify the commit message. -The default 'pre-commit' hook, when enabled--and with the -`hooks.allownonascii` config option unset or set to false--prevents -the use of non-ASCII filenames. +The default 'pre-commit' hook, when enabled, prevents the introduction +of non-ASCII filenames and lines with trailing whitespace. The non-ASCII +check can be turned off by setting the `hooks.allownonascii` config +option to `true`. pre-merge-commit ~~~~~~~~~~~~~~~~ diff --git a/githooks.html b/githooks.html index 23be8fe9b..b6798ccff 100644 --- a/githooks.html +++ b/githooks.html @@ -569,19 +569,15 @@

pre-commit

causes the git commit command to abort before creating a commit.

-

The default pre-commit hook, when enabled, catches introduction -of lines with trailing whitespaces and aborts the commit when -such a line is found.

-
-

All the git commit hooks are invoked with the environment variable GIT_EDITOR=: if the command will not bring up an editor to modify the commit message.

-

The default pre-commit hook, when enabled—​and with the -hooks.allownonascii config option unset or set to false—​prevents -the use of non-ASCII filenames.

+

The default pre-commit hook, when enabled, prevents the introduction +of non-ASCII filenames and lines with trailing whitespace. The non-ASCII +check can be turned off by setting the hooks.allownonascii config +option to true.

@@ -1400,7 +1396,7 @@

GIT