Merge branch 'mh/fix-send-email-threaded'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d31adb6719eeff3009a2799b89d5ae6d343d3e88..3a86d1f8f05317717d718a6db7c5e0f9acb47d6b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -429,10 +429,19 @@ relatively high IO latencies.  With this set to 'true', git will do the
 index comparison to the filesystem data in parallel, allowing
 overlapping IO's.
 
-core.unreliableHardlinks::
-       Some filesystem drivers cannot properly handle hardlinking a file
-       and deleting the source right away.  In such a case, you need to
-       set this config variable to 'true'.
+core.createObject::
+       You can set this to 'link', in which case a hardlink followed by
+       a delete of the source are used to make sure that object creation
+       will not overwrite existing objects.
++
+On some file system/operating system combinations, this is unreliable.
+Set this config setting to 'rename' there; However, This will remove the
+check that makes sure that existing object files will not get overwritten.
+
+add.ignore-errors::
+       Tells 'git-add' to continue adding files when some files cannot be
+       added due to indexing errors. Equivalent to the '--ignore-errors'
+       option of linkgit:git-add[1].
 
 alias.*::
        Command aliases for the linkgit:git[1] command wrapper - e.g.
@@ -600,6 +609,12 @@ color.pager::
        A boolean to enable/disable colored output when the pager is in
        use (default is true).
 
+color.showbranch::
+       A boolean to enable/disable color in the output of
+       linkgit:git-show-branch[1]. May be set to `always`,
+       `false` (or `never`) or `auto` (or `true`), in which case colors are used
+       only when the output is to a terminal. Defaults to false.
+
 color.status::
        A boolean to enable/disable color in the output of
        linkgit:git-status[1]. May be set to `always`,