summaryrefslogtreecommitdiff
path: root/Documentation/git-daemon.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-11 13:03:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-11 13:03:21 -0700
commit3b8d2765c794ef1f1c7b39a90f72c4e61ce26fbd (patch)
tree0af328a7a081562447ce79a5c19ddd1f26284bb7 /Documentation/git-daemon.txt
parentMerge branch 'mh/maint-lockfile-overflow' (diff)
parentt/t5528-push-default: test pushdefault workflows (diff)
downloadtgif-3b8d2765c794ef1f1c7b39a90f72c4e61ce26fbd.tar.xz
Merge branch 'jc/triangle-push-fixup'
Earlier remote.pushdefault (and per-branch branch.*.pushremote) were introduced as an additional mechanism to choose what repository to push into when "git push" did not say it from the command line, to help people who push to a repository that is different from where they fetch from. This attempts to finish that topic by teaching the default mechanism to choose branch in the remote repository to be updated by such a push. The 'current', 'matching' and 'nothing' modes (specified by the push.default configuration variable) extend to such a "triangular" workflow naturally, but 'upstream' and 'simple' have to be updated. . 'upstream' is about pushing back to update the branch in the remote repository that the current branch fetches from and integrates with, it errors out in a triangular workflow. . 'simple' is meant to help new people by avoiding mistakes, and will be the safe default in Git 2.0. In a non-triangular workflow, it will continue to act as a cross between 'upstream' and 'current' in that it pushes to the current branch's @{upstream} only when it is set to the same name as the current branch (e.g. your 'master' forks from the 'master' from the central repository). In a triangular workflow, this series tentatively defines it as the same as 'current', but we may have to tighten it to avoid surprises in some way. * jc/triangle-push-fixup: t/t5528-push-default: test pushdefault workflows t/t5528-push-default: generalize test_push_* push: change `simple` to accommodate triangular workflows config doc: rewrite push.default section t/t5528-push-default: remove redundant test_config lines
Diffstat (limited to 'Documentation/git-daemon.txt')
0 files changed, 0 insertions, 0 deletions