Undocument deprecated alias 'push.default=tracking'

moy · gitster · commit 628ab0ea1046 · 2012-04-24T12:11:58.000-07:00
It's been deprecated since 53c4031 (Johan Herland, Wed Feb 16 2011, push.default: Rename 'tracking' to 'upstream'), so it's OK to remove it from documentation (even though it's still supported) to make the explanations more readable. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -1690,7 +1690,6 @@ push.default::
   With this, `git push` will update the same remote ref as the one which
   is merged by `git pull`, making `push` and `pull` symmetrical.
   See "branch.<name>.merge" for how to configure the upstream branch.
-* `tracking` - deprecated synonym for `upstream`.
 * `current` - push the current branch to a branch of the same name.
   +
   The `current` and `upstream` modes are for those who want to

Original file line number	Diff line number	Diff line change
`@@ -1690,7 +1690,6 @@ push.default::`
`1690`	`1690`	With this, `git push` will update the same remote ref as the one which
`1691`	`1691`	is merged by `git pull`, making `push` and `pull` symmetrical.
`1692`	`1692`	`See "branch.<name>.merge" for how to configure the upstream branch.`
`1693`		-* `tracking` - deprecated synonym for `upstream`.
`1694`	`1693`	* `current` - push the current branch to a branch of the same name.
`1695`	`1694`	`+`
`1696`	`1695`	The `current` and `upstream` modes are for those who want to