From: Junio C Hamano Date: Wed, 14 Sep 2022 19:56:39 +0000 (-0700) Subject: Merge branch 'ab/dedup-config-and-command-docs' X-Git-Tag: v2.38.0-rc0~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a54d740451c1438b4db009bf2ebe1669c280ef8;p=thirdparty%2Fgit.git Merge branch 'ab/dedup-config-and-command-docs' Share the text used to explain configuration variables used by "git " in "git help " with the text from "git help config". * ab/dedup-config-and-command-docs: docs: add CONFIGURATION sections that fuzzy map to built-ins docs: add CONFIGURATION sections that map to a built-in log docs: de-duplicate configuration sections difftool docs: de-duplicate configuration sections notes docs: de-duplicate and combine configuration sections apply docs: de-duplicate configuration sections send-email docs: de-duplicate configuration sections grep docs: de-duplicate configuration sections docs: add and use include template for config/* includes --- 7a54d740451c1438b4db009bf2ebe1669c280ef8 diff --cc Documentation/git-commit-graph.txt index 047decdb65,5225f67454..36fe56c2c7 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@@ -142,12 -142,14 +142,19 @@@ $ git show-ref -s | git commit-graph wr $ git rev-parse HEAD | git commit-graph write --stdin-commits --append ------------------------------------------------ + CONFIGURATION + ------------- + + include::includes/cmd-config-section-all.txt[] + + include::config/commitgraph.txt[] + +FILE FORMAT +----------- + +see linkgit:gitformat-commit-graph[5]. + GIT --- Part of the linkgit:git[1] suite