diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-13 16:52:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-13 16:52:49 -0700 |
| commit | 07e230d762bde9ce5fa41384efb8caed4c7de684 (patch) | |
| tree | 9e31c6605e7288757ea438d75d1c60f91c1cff53 /Documentation/config | |
| parent | Merge branch 'zh/cat-file-batch-fix' (diff) | |
| parent | doc: push: explain default=simple correctly (diff) | |
| download | tgif-07e230d762bde9ce5fa41384efb8caed4c7de684.tar.xz | |
Merge branch 'fc/push-simple-updates'
Some code and doc clarification around "git push".
* fc/push-simple-updates:
doc: push: explain default=simple correctly
push: remove unused code in setup_push_upstream()
push: simplify setup_push_simple()
push: reorganize setup_push_simple()
push: copy code to setup_push_simple()
push: hedge code of default=simple
push: rename !triangular to same_remote
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/push.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt index f2667b2689..632033638c 100644 --- a/Documentation/config/push.txt +++ b/Documentation/config/push.txt @@ -24,15 +24,14 @@ push.default:: * `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. +* `simple` - pushes the current branch with the same name on the remote. + -When pushing to a remote that is different from the remote you normally -pull from, work as `current`. This is the safest option and is suited -for beginners. +If you are working on a centralized workflow (pushing to the same repository you +pull from, which is typically `origin`), then you need to configure an upstream +branch with the same name. + -This mode has become the default in Git 2.0. +This mode is the default since Git 2.0, and is the safest option suited for +beginners. * `matching` - push all branches having the same name on both ends. This makes the repository you are pushing to remember the set of |