development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jc/mention-tracking-for-pull-default'

Browse source 
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
This commit is contained in:
Junio C Hamano 2013-02-18 16:05:02 -08:00
commit 20a599e2c1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/config.txt
View file

@ -1811,7 +1811,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.<name>.merge" for how to configure the upstream branch.