Re: [PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Junio C Hamano
Matthieu Moy writes: > Ævar Arnfjörð Bjarmason writes: > >> Junio, looks like from the 2013 discussion that you preferred just >> having that mention in parenthesis instead of its own item, how about >> just re-applying your fa23348 (with

Re: [PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Matthieu Moy
Ævar Arnfjörð Bjarmason writes: > Junio, looks like from the 2013 discussion that you preferred just > having that mention in parenthesis instead of its own item, how about > just re-applying your fa23348 (with conflicts resolved)? (fa23348 did this: ---

Re: [PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 6, 2016 at 2:13 PM, Matthieu Moy wrote: > Ęvar Arnfjörš Bjarmason writes: > >> That's bad, either we shouldn't support it at all, or we should >> document what it does. This patch does the latter. > > I vaguely remember a similar

Re: [PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Matthieu Moy
Ævar Arnfjörð Bjarmason writes: > That's bad, either we shouldn't support it at all, or we should > document what it does. This patch does the latter. I vaguely remember a similar discussion and probably even a patch in the past (maybe by you actually). I think the proposal

Re: [PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Johan Herland
On Thu, Oct 6, 2016 at 10:49 AM, Ævar Arnfjörð Bjarmason wrote: > Change the documentation for push.tracking=* to re-include a mention > of what "tracking" does. > > The "tracking" option was renamed to "upstream" back in > 53c4031 ("push.default: Rename 'tracking' to

[PATCH] push: Re-include "push.default=tracking" in the documentation

2016-10-06 Thread Ævar Arnfjörð Bjarmason
Change the documentation for push.tracking=* to re-include a mention of what "tracking" does. The "tracking" option was renamed to "upstream" back in 53c4031 ("push.default: Rename 'tracking' to 'upstream'", 2011-02-16), this section was then subsequently rewritten in 87a70e4 ("config doc: