diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-03-19 14:36:36 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-20 10:59:43 -0700 |
| commit | e4e016f65da6c7cc94709bec079d61f4bed7b196 (patch) | |
| tree | e73916673c1c3d0f681bf4be1a30f61434dca5a0 | |
| parent | 7c9c2f8c394a4c1f4e09d6d5542c4e7965cc9240 (diff) | |
| download | git-ab/push-default-doc-fix.tar.gz | |
push: mention "push.default=tracking" in the documentationab/push-default-doc-fix
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 2 insertions, 0 deletions
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. |