Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc

* mm/maint-sort-config-doc:
  config.txt: alphabetize configuration sections

Conflicts:
	Documentation/config.txt

diff --cc Documentation/config.txt
index d536732217839f1d525081abcc52dfb37a73f85e,113d9d1438891b51d11f2fee2764c88e69024921..220b9371981cb76159e150f1c6d2ab2b973d1f44
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1079,6 -998,28 +1063,41 @@@ pull.octopus:
  pull.twohead::
        The default merge strategy to use when pulling a single branch.
  
+ receive.fsckObjects::
+       If it is set to true, git-receive-pack will check all received
+       objects. It will abort in the case of a malformed object or a
+       broken link. The result of an abort are only dangling objects.
+       Defaults to false.
+ 
+ receive.unpackLimit::
+       If the number of objects received in a push is below this
+       limit then the objects will be unpacked into loose object
+       files. However if the number of received objects equals or
+       exceeds this limit then the received pack will be stored as
+       a pack, after adding any missing delta bases.  Storing the
+       pack from a push can make the push operation complete faster,
+       especially on slow filesystems.  If not set, the value of
+       `transfer.unpackLimit` is used instead.
+ 
++receive.denyDeletes::
++      If set to true, git-receive-pack will deny a ref update that deletes
++      the ref. Use this to prevent such a ref deletion via a push.
++
++receive.denyCurrentBranch::
++      If set to true or "refuse", receive-pack will deny a ref update
++      to the currently checked out branch of a non-bare repository.
++      Such a push is potentially dangerous because it brings the HEAD
++      out of sync with the index and working tree. If set to "warn",
++      print a warning of such a push to stderr, but allow the push to
++      proceed. If set to false or "ignore", allow such pushes with no
++      message. Defaults to "warn".
++
+ receive.denyNonFastForwards::
+       If set to true, git-receive-pack will deny a ref update which is
+       not a fast forward. Use this to prevent such an update via a push,
+       even if that push is forced. This configuration variable is
+       set when initializing a shared repository.
+ 
  remote.<name>.url::
        The URL of a remote repository.  See linkgit:git-fetch[1] or
        linkgit:git-push[1].

diff --cc Documentation/merge-config.txt
index c735788b0f1c8efb0b250d4810be420be6c62f89,c735788b0f1c8efb0b250d4810be420be6c62f89..86d5b26ab2c67940727423fb119d0f446d734db9
--- 1/Documentation/merge-config.txt
--- 2/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@@ -1,6 -1,6 +1,10 @@@
--merge.stat::
--      Whether to print the diffstat between ORIG_HEAD and the merge result
--      at the end of the merge.  True by default.
++merge.conflictstyle::
++      Specify the style in which conflicted hunks are written out to
++      working tree files upon merge.  The default is "merge", which
++      shows `<<<<<<<` conflict marker, change made by one side,
++      `=======` marker, change made by the other side, and then
++      `>>>>>>>` marker.  An alternate style, "diff3", adds `|||||||`
++      marker and the original text before `=======` marker.
  
  merge.log::
        Whether to include summaries of merged commits in newly created
@@@ -11,6 -11,6 +15,10 @@@ merge.renameLimit:
        during a merge; if not specified, defaults to the value of
        diff.renameLimit.
  
++merge.stat::
++      Whether to print the diffstat between ORIG_HEAD and the merge result
++      at the end of the merge.  True by default.
++
  merge.tool::
        Controls which merge resolution program is used by
        linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",