summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-06-19 11:11:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-24 03:50:34 (GMT)
commit87a70e4ce8bb3bdbb3048a5eb837f6b5b2eff8f9 (patch)
treeb9f8e90b3aa96799827c28f4f957f8409f901275 /builtin
parent3cb8a5ff1756f11fe60b9c6ed3f9fe593e9c6d62 (diff)
downloadgit-87a70e4ce8bb3bdbb3048a5eb837f6b5b2eff8f9.zip
git-87a70e4ce8bb3bdbb3048a5eb837f6b5b2eff8f9.tar.gz
git-87a70e4ce8bb3bdbb3048a5eb837f6b5b2eff8f9.tar.bz2
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>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions