summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-14 11:49:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-14 11:49:10 -0700
commitfa9aaa8f1051bd7b0cd437a5006898277ec42805 (patch)
treec61245e041ea4e0bdcf2c4cd09555ae5bc324b82 /Documentation/git-mergetool.txt
parentMerge branch 'sb/plug-streaming-leak' (diff)
parentpush-to-deploy: allow pushing into an unborn branch and updating it (diff)
downloadtgif-fa9aaa8f1051bd7b0cd437a5006898277ec42805.tar.xz
Merge branch 'jc/update-instead-into-void'
A push into an unborn branch, with "receive.denyCurrentBranch" set to "updateInstead", did not check out the working tree as expected. * jc/update-instead-into-void: push-to-deploy: allow pushing into an unborn branch and updating it
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions