Skip to content

Commit fa23348

Browse files
committed
doc: mention tracking for pull.default
When looking at a configuration file edited long time ago, a user may find 'pull.default = tracking' and wonder what it means, but earlier we stopped mentioning this value, even though the code still support it and more importantly, we have no intention to force old timers to update their configuration files. Instead of not mentioning it, add it to the description in a way that makes it clear that users have no reason to add new uses of it preferring over 'upstream', by not listing it as a separate item on the same footing as other values but as a deprecated synonym of the 'upstream' in its description. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7e20105 commit fa23348

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
@@ -1749,7 +1749,8 @@ push.default::
17491749
+
17501750
This is currently the default, but Git 2.0 will change the default
17511751
to `simple`.
1752-
* `upstream` - push the current branch to its upstream branch.
1752+
* `upstream` - push the current branch to its upstream branch
1753+
(`tracking` is a deprecated synonym for this).
17531754
With this, `git push` will update the same remote ref as the one which
17541755
is merged by `git pull`, making `push` and `pull` symmetrical.
17551756
See "branch.<name>.merge" for how to configure the upstream branch.

0 commit comments

Comments
 (0)