Merge branch 'ab/dedup-config-and-command-docs'

Share the text used to explain configuration variables used by "git
<subcmd>" in "git help <subcmd>" 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

diff --cc Documentation/Makefile
Simple merge

diff --cc Documentation/config/log.txt
Simple merge

diff --cc Documentation/git-add.txt
Simple merge

diff --cc Documentation/git-am.txt
Simple merge

diff --cc Documentation/git-clone.txt
Simple merge

diff --cc Documentation/git-commit-graph.txt
index 047decdb65b029f1974e7ca2c07406a5ca868bdd,5225f674546a4a388be7819351749f205f4ccd00..36fe56c2c7192906add8bc04d43c1c5cca4aa372
--- 1/Documentation/git-commit-graph.txt
--- 2/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

diff --cc Documentation/git-log.txt
Simple merge

diff --cc Documentation/git-merge.txt
Simple merge

diff --cc Documentation/git-rebase.txt
Simple merge

diff --cc Documentation/git-revert.txt
Simple merge