[PATCH 2/6] config doc: rewrite push.default section

2013-06-23 Thread Junio C Hamano
From: Ramkumar Ramachandra 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 ex

Re: [PATCH 2/6] config doc: rewrite push.default section

2013-06-20 Thread Johan Herland
On Thu, Jun 20, 2013 at 5:27 AM, Junio C Hamano wrote: > +* `simple` - a safer version of `current`; push the current branch > + to update a branch with the same name on the receiving end, with a > + safety feature: in central workflows, error out if your current > + branch is not set to integr

Re: [PATCH 2/6] config doc: rewrite push.default section

2013-06-19 Thread Junio C Hamano
Junio C Hamano writes: > or something like that. Just for a completeness, in a patch form: Documentation/config.txt | 66 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 8

Re: [PATCH 2/6] config doc: rewrite push.default section

2013-06-19 Thread Junio C Hamano
Ramkumar Ramachandra writes: > push.default:: > + Defines the action `git push` should take if no refspec is > + explicitly given. Different values are well-suited for > + specific workflows; for instance, in a purely central workflow > + (i.e. the fetch source is equal to the p

[PATCH 2/6] config doc: rewrite push.default section

2013-06-19 Thread Ramkumar Ramachandra
4d3592 (Merge branch 'rr/triangle', 2013-04-07) introduced support for triangular workflows in Git, but the push.default values still assume central workflows. Rewrite the descriptions of `nothing`, `current`, `upstream` and `matching` for greater clarity, and explicitly explaining how they behave