From: Ævar Arnfjörð Bjarmason Date: Sun, 19 Mar 2017 14:36:36 +0000 (+0000) Subject: push: mention "push.default=tracking" in the documentation X-Git-Tag: v2.12.2~2^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e4e016f65da6c7cc94709bec079d61f4bed7b196 push: mention "push.default=tracking" in the documentation 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 015346c417..08cb63fd2a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2432,6 +2432,8 @@ push.default:: pushing to the same repository you would normally pull from (i.e. central workflow). +* `tracking` - This is a deprecated synonym for `upstream`. + * `simple` - in centralized workflow, work like `upstream` with an added safety to refuse to push if the upstream branch's name is different from the local one.