projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 48bf2fa) | patch
doc: merge: mention default of defaulttoupstream
authorFelipe Contreras <felipe.contreras@gmail.com>
Tue, 8 Jun 2021 01:58:07 +0000 (20:58 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jun 2021 05:24:51 +0000 (14:24 +0900)
commit8603c419d3b7619b9958541461eb024c767cf212
treea3fef35e6d5ee5d2d7e37db0400c906ca79670d5tree | snapshot
parent48bf2fa8bad054d66bd79c6ba903c89c704201f7commit | diff
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>
Documentation/config/merge.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.