summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-31 17:34:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-03 00:39:18 -0800
commit3d95d92b9a75825b2d9c9bd770d85471b18597f8 (patch)
treeaf2776b75baaaca60b00601e98e9165726375474 /Documentation/git-merge-one-file.txt
parentUpdate draft release notes to 1.6.2 (diff)
downloadtgif-3d95d92b9a75825b2d9c9bd770d85471b18597f8.tar.xz
receive-pack: explain what to do when push updates the current branch
This makes "git push" issue a more detailed instruction when a user pushes into the current branch of a non-bare repository without having an explicit configuration set to receive.denycurrentbranch. In such a case, it will also tell the user that the default will change to refusal in a future version of git. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions