| commit | 87a70e4ce8bb3bdbb3048a5eb837f6b5b2eff8f9 | |
| author | Ramkumar Ramachandra <artagnon@gmail.com> | |
| Wed, 19 Jun 2013 11:11:40 +0000 (19 16:41 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Jun 2013 03:50:34 +0000 (23 20:50 -0700) | ||
| tree | b9f8e90b3aa96799827c28f4f957f8409f901275 | treesnapshot (tar.gz zip) |
| parent | 3cb8a5ff1756f11fe60b9c6ed3f9fe593e9c6d62 | commitdiff |
config doc: rewrite push.default section
4d35924e (Merge branch 'rr/triangle', 2013-04-07) introduced support
for triangular workflows, but the push.default values still assume
central workflows.
Rewrite the descriptions of `nothing`, `current`, `upstream` and
`matching` for greater clarity, and explicitly explain how they
should behave in triangular workflows.
Leave `simple` as it is for the moment, as we plan to change its
meaning to accommodate triangular workflows in a later patch.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4d35924e (Merge branch 'rr/triangle', 2013-04-07) introduced support
for triangular workflows, but the push.default values still assume
central workflows.
Rewrite the descriptions of `nothing`, `current`, `upstream` and
`matching` for greater clarity, and explicitly explain how they
should behave in triangular workflows.
Leave `simple` as it is for the moment, as we plan to change its
meaning to accommodate triangular workflows in a later patch.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/config.txt | diffblobblamehistory |