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

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-24 12:57:54 -07:00
Родитель 7bd881f7ca e4e016f65d
Коммит ce9e6178d3
1 изменённых файлов: 2 добавлений и 0 удалений

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

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