summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Pete Harlan <pgit@pcharlan.com>2011-12-06 23:01:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-11 21:26:57 -0800
commit3d0b05176f0539b8d71e712016c367768fc046d5 (patch)
treee35e35be30b27cdd139e5f7dd0335c50de9c6984 /Documentation/git-merge-file.txt
parentcheckout -m: no need to insist on having all 3 stages (diff)
downloadtgif-3d0b05176f0539b8d71e712016c367768fc046d5.tar.xz
Test 'checkout -m -- path'
Signed-off-by: Pete Harlan <pgit@pcharlan.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions