diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2021-06-07 20:58:07 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-06-08 14:24:51 +0900 |
| commit | 8603c419d3b7619b9958541461eb024c767cf212 (patch) | |
| tree | a3fef35e6d5ee5d2d7e37db0400c906ca79670d5 /t/t6437-submodule-merge.sh | |
| parent | Git 2.31.1 (diff) | |
| download | tgif-8603c419d3b7619b9958541461eb024c767cf212.tar.xz | |
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>
Diffstat (limited to 't/t6437-submodule-merge.sh')
0 files changed, 0 insertions, 0 deletions