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>
Felipe Contreras committed
Jun 7, 2021 at 20:58 UTC
8603c419d3b7619b9958541461eb024c767cf212
1 file changed
+1
-1
Documentation/config/merge.txt
+1
-1
@@ -14,7 +14,7 @@ merge.defaultToUpstream::
14
branches at the remote named by `branch.<current branch>.remote`
15
are consulted, and then they are mapped via `remote.<remote>.fetch`
16
to their corresponding remote-tracking branches, and the tips of
17
- these tracking branches are merged.
17
+ these tracking branches are merged. Defaults to true.
18
19
merge.ff::
20
By default, Git does not create an extra merge commit when merging