diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:57:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:57:54 -0700 |
| commit | ce9e6178d31a61db05acd2c7311651d1da31d18f (patch) | |
| tree | ead37675f22605bda20f6703baff64822ed95ca1 /Documentation/config.txt | |
| parent | Merge branch 'nd/commit-hook-doc-fix' into maint (diff) | |
| parent | push: mention "push.default=tracking" in the documentation (diff) | |
| download | tgif-ce9e6178d31a61db05acd2c7311651d1da31d18f.tar.xz | |
Merge branch 'ab/push-default-doc-fix' into maint
Doc fix.
* ab/push-default-doc-fix:
push: mention "push.default=tracking" in the documentation
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 038a32d01b..953cf69117 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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. |