[PATCH] doc: merge: mention default of defaulttoupstream
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Jun 8, 2021, 01:58 UTC
- Message-ID
- <20210608015807.906101-1-felipe.contreras@gmail.com>
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> --- Documentation/config/merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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.<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
-- 2.32.0.2.g41be0a4e50