summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-05 19:40:36 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-05 19:40:36 -0800
commit5d680a67d7909c89af96eba4a2d77abed606292b (patch)
tree8d9c57523870b307d5794df3b5815d848565b5f4 /Documentation/git-merge-one-file.txt
parentMerge branch 'rc/http-push' (diff)
parentreceive-pack: explain what to do when push updates the current branch (diff)
downloadtgif-5d680a67d7909c89af96eba4a2d77abed606292b.tar.xz
Merge branch 'jc/refuse-push-to-current'
* jc/refuse-push-to-current: receive-pack: explain what to do when push updates the current branch
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions