From: Junio C Hamano Date: Thu, 31 Jan 2013 20:50:38 +0000 (-0800) Subject: doc: mention tracking for pull.default X-Git-Tag: v1.8.2-rc1~9^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fa23348e95a3a98ca42a4b74e8f17fb52b95ded8;p=git-core%2Fgit.git 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 --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 122e3c499..10e28560e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1749,7 +1749,8 @@ push.default:: + This is currently the default, but Git 2.0 will change the default to `simple`. -* `upstream` - push the current branch to its upstream branch. +* `upstream` - push the current branch to its upstream branch + (`tracking` is a deprecated synonym for this). 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..merge" for how to configure the upstream branch.