doc: merge: mention default of defaulttoupstream

Commit a01f7f2ba0 (merge: enable defaulttoupstream by default,
2014-04-20) forgot to mention the new default in the configuration
documentation.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
index cb2ed589075baaeb4001fa84df9bcce524da4a15..6b66c83eabeea5309e07efb54eb450ffebf71d26 100644 (file)
--- a/Documentation/config/merge.txt
+++ b/Documentation/config/merge.txt
@@ -14,7 +14,7 @@ merge.defaultToUpstream::
        branches at the remote named by `branch.<current branch>.remote`
        are consulted, and then they are mapped via `remote.<remote>.fetch`
        to their corresponding remote-tracking branches, and the tips of
-       these tracking branches are merged.
+       these tracking branches are merged. Defaults to true.
 
 merge.ff::
        By default, Git does not create an extra merge commit when merging