diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2021-05-31 14:32:37 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-06-02 10:09:52 +0900 |
| commit | 90cfb2666b5913e0be4ffb84630866287dde4f9a (patch) | |
| tree | f8a0bed5ffb928c688f5cab9b522125e8e5ece16 /mergetools/gvimdiff | |
| parent | push: remove unused code in setup_push_upstream() (diff) | |
| download | tgif-90cfb2666b5913e0be4ffb84630866287dde4f9a.tar.xz | |
doc: push: explain default=simple correctly
Now that the code has been simplified and it's clear what it's
actually doing, update the documentation to reflect that.
Namely; the simple mode only barfs when working on a centralized
workflow, and there's no configured upstream branch with the same name.
Cc: Elijah Newren <newren@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions