diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2012-04-24 09:50:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-24 12:11:58 -0700 |
| commit | 628ab0ea1046800b9520c07d809db886b1ec3693 (patch) | |
| tree | 1afe9cc7d0fdda4011e26aa53102f87a39c9a3d5 /Documentation/config.txt | |
| parent | 185c0874b1adea696b47d2fb78aca9a282a86abb (diff) | |
| download | git-628ab0ea1046800b9520c07d809db886b1ec3693.tar.gz git-628ab0ea1046800b9520c07d809db886b1ec3693.tar.xz | |
Undocument deprecated alias 'push.default=tracking'
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>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5f14871d2..9617c5395 100644 --- 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 |