Skip to content

Commit e4e016f

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7c9c2f8 commit e4e016f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Documentation/config.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,6 +2432,8 @@ push.default::
24322432
pushing to the same repository you would normally pull from
24332433
(i.e. central workflow).
24342434

2435+
* `tracking` - This is a deprecated synonym for `upstream`.
2436+
24352437
* `simple` - in centralized workflow, work like `upstream` with an
24362438
added safety to refuse to push if the upstream branch's name is
24372439
different from the local one.

0 commit comments

Comments
 (0)