Re: [PATCH] push: Re-include "push.default=tracking" in the documentation
- From
Johan Herland <johan@herland.net>
- Date
- Oct 6, 2016, 09:13 UTC
- Message-ID
- <CALKQrgeBwT=20CRysy55VwymaWqVKEqPYexviiiZG4HZxS9_nQ@mail.gmail.com>
- In-Reply-To
- <20161006084905.14944-1-avarab@gmail.com>
On Thu, Oct 6, 2016 at 10:49 AM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
Show 18 quoted lines
> 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:
> rewrite push.default section", 2013-06-19) to remove any mention of
> "tracking".
>
> Maybe we should just warn or die nowadays if this option is in the
> config, but I had some old config of mine use this option, I'd
> forgotten that it was a synonym, and nothing in git's documentation
> mentioned that.
>
> That's bad, either we shouldn't support it at all, or we should
> document what it does. This patch does the latter.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>Acked-by: Johan Herland <johan@herland.net>
-- Johan Herland, <johan@herland.net> www.herland.net