Skip to content

Commit 20a599e

Browse files
committed
Merge branch 'jc/mention-tracking-for-pull-default'
We stopped mentioning `tracking` is a deprecated but supported synonym for `upstream` in pull.default even though we have no intention of removing the support for it. * jc/mention-tracking-for-pull-default: doc: mention tracking for pull.default
2 parents 48050fb + fa23348 commit 20a599e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/config.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,8 @@ push.default::
18111811
+
18121812
This is currently the default, but Git 2.0 will change the default
18131813
to `simple`.
1814-
* `upstream` - push the current branch to its upstream branch.
1814+
* `upstream` - push the current branch to its upstream branch
1815+
(`tracking` is a deprecated synonym for this).
18151816
With this, `git push` will update the same remote ref as the one which
18161817
is merged by `git pull`, making `push` and `pull` symmetrical.
18171818
See "branch.<name>.merge" for how to configure the upstream branch.

0 commit comments

Comments
 (0)