summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5f14871d2a..9617c53951 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