summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.adoc
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-04 08:10:33 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-04 08:10:33 -0700
commitd63f334a8242f9e993b5bfb451f03394023ab877 (patch)
tree7ddeaf84467ba1fce6ce2f3bc3d10825694bde53 /Documentation/git-commit.adoc
parent540aaa607c5efcd94bb852a76a8ec3e07ea9a7bc (diff)
parent2b3ae04011c3d679ba601c7ef9e20b9dec125ebb (diff)
downloadgit-d63f334a8242f9e993b5bfb451f03394023ab877.tar.xz
Merge branch 'lm/add-p-context'
"git add/etc -p" now honor the diff.context configuration variable, and also they learn to honor the -U<n> command-line option. * lm/add-p-context: add-patch: add diff.context command line overrides add-patch: respect diff.context configuration t: use test_config in t4055 t: use test_grep in t3701 and t4055
Diffstat (limited to 'Documentation/git-commit.adoc')
-rw-r--r--Documentation/git-commit.adoc2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-commit.adoc b/Documentation/git-commit.adoc
index dc219025f1..ae988a883b 100644
--- a/Documentation/git-commit.adoc
+++ b/Documentation/git-commit.adoc
@@ -76,6 +76,8 @@ OPTIONS
which changes to commit. See linkgit:git-add[1] for
details.
+include::diff-context-options.adoc[]
+
`-C <commit>`::
`--reuse-message=<commit>`::
Take an existing _<commit>_ object, and reuse the log message