diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:14:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:14:57 -0700 |
| commit | 11fac260fe6192cfeb877cf560531e50e1ea2025 (patch) | |
| tree | e22699d1d11099dfda3c26ae95e0ec55087f10f2 /Documentation/config | |
| parent | Merge branch 'js/trace2-discard-event-docfix' (diff) | |
| parent | doc: merge: mention default of defaulttoupstream (diff) | |
| download | tgif-11fac260fe6192cfeb877cf560531e50e1ea2025.tar.xz | |
Merge branch 'fc/doc-default-to-upstream-config'
Doc clean-up.
* fc/doc-default-to-upstream-config:
doc: merge: mention default of defaulttoupstream
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |