kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Doc fix.

* ab/push-default-doc-fix:
  push: mention "push.default=tracking" in the documentation
maint
Junio C Hamano 2017-03-24 12:57:54 -07:00
parent 7bd881f7ca e4e016f65d
commit ce9e6178d3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -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.