From: Junio C Hamano Date: Thu, 31 Jan 2013 20:50:38 GMT Subject: Re: [PATCH 2/7] Undocument deprecated alias 'push.default=tracking' Message-ID: <7vobg5f55t.fsf@alter.siamese.dyndns.org> In-Reply-To: <7v622dgl2o.fsf@alter.siamese.dyndns.org> How about doing it this way? I do not think anything that is deprecated even deserves a separate section and "do not use it!" heading. -- >8 -- When looking at a configuration file edited long time ago, a user may find 'pull.default = tracking' and wonder what it means. 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'. Documentation/config.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index d7ec507..8441050 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1795,7 +1795,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.