Merge branch 'ab/push-default-doc-fix'

Doc fix.

* ab/push-default-doc-fix:
  push: mention "push.default=tracking" in the documentation
This commit is contained in:
Junio C Hamano 2017-03-21 15:07:19 -07:00
Родитель 9f43095e46 e4e016f65d
Коммит b7b57b1434
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -2521,6 +2521,8 @@ push.default::
pushing to the same repository you would normally pull from pushing to the same repository you would normally pull from
(i.e. central workflow). (i.e. central workflow).
* `tracking` - This is a deprecated synonym for `upstream`.
* `simple` - in centralized workflow, work like `upstream` with an * `simple` - in centralized workflow, work like `upstream` with an
added safety to refuse to push if the upstream branch's name is added safety to refuse to push if the upstream branch's name is
different from the local one. different from the local one.