diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:19 -0700 |
| commit | b7b57b143417f8b89e17aeb501b7c54c13508959 (patch) | |
| tree | fc43ffbff451b25856c48a637d87a0ed107b0bb0 /Documentation/config.txt | |
| parent | Merge branch 'ab/doc-no-option-notation-fix' (diff) | |
| parent | push: mention "push.default=tracking" in the documentation (diff) | |
| download | tgif-b7b57b143417f8b89e17aeb501b7c54c13508959.tar.xz | |
Merge branch 'ab/push-default-doc-fix'
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 cf281f64f1..0d8df5a9f9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2521,6 +2521,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. |