From: Felipe Contreras Date: Tue, 8 Jun 2021 01:58:07 +0000 (-0500) Subject: doc: merge: mention default of defaulttoupstream X-Git-Tag: v2.33.0-rc0~101^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8603c419d3b7619b9958541461eb024c767cf212;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt index cb2ed58907..6b66c83eab 100644 --- a/Documentation/config/merge.txt +++ b/Documentation/config/merge.txt @@ -14,7 +14,7 @@ merge.defaultToUpstream:: branches at the remote named by `branch..remote` are consulted, and then they are mapped via `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