aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-commit.adoc
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-17 09:27:06 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-17 09:27:06 -0700
commit413ff100cdac43f14cbdfd5d117d9400d5adc860 (patch)
tree142849d7c587bcd612f25fea7ad41f8312895e81 /Documentation/git-commit.adoc
parentMerge branch 'ad/t1517-short-help-tests-fix' into next (diff)
parentdoc lint: check that synopsis manpages have synopsis inlines (diff)
downloadgit-413ff100cdac43f14cbdfd5d117d9400d5adc860.tar.gz
git-413ff100cdac43f14cbdfd5d117d9400d5adc860.zip
Merge branch 'ja/doc-lint-sections-and-synopsis' into next
Doc lint updates to encourage the newer and easier-to-use `synopsis` format, with fixes to a handful of existing uses. * ja/doc-lint-sections-and-synopsis: doc lint: check that synopsis manpages have synopsis inlines doc:git-for-each-ref: fix styling and typos doc: check for absence of the form --[no-]parameter doc: check for absence of multiple terms in each entry of desc list doc: check well-formedness of delimited sections doc: test linkgit macros for well-formedness
Diffstat (limited to 'Documentation/git-commit.adoc')
-rw-r--r--Documentation/git-commit.adoc4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-commit.adoc b/Documentation/git-commit.adoc
index ae988a883b..54c207ad45 100644
--- a/Documentation/git-commit.adoc
+++ b/Documentation/git-commit.adoc
@@ -214,7 +214,8 @@ include::signoff-option.adoc[]
each trailer would appear, and other details.
`-n`::
-`--[no-]verify`::
+`--verify`::
+`--no-verify`::
Bypass the `pre-commit` and `commit-msg` hooks.
See also linkgit:githooks[5].
@@ -281,6 +282,7 @@ variable (see linkgit:git-config[1]).
+
--
It is a rough equivalent for:
+
------
$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...