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 /t/t3309-notes-merge-auto-resolve.sh | |
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 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions