summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-08-30 07:52:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-30 19:57:55 -0700
commit0cf8581e330e7140c9f5c94a53d441187c0f8ff9 (patch)
treea1e46a0198f62914d29e8e1429b8efce58ada4ee /Documentation/diff-format.txt
parentMerge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution' (diff)
downloadtgif-0cf8581e330e7140c9f5c94a53d441187c0f8ff9.tar.xz
checkout -m: recreate merge when checking out of unmerged index
This teaches git-checkout to recreate a merge out of unmerged index entries while resolving conflicts. With this patch, checking out an unmerged path from the index now have the following possibilities: * Without any option, an attempt to checkout an unmerged path will atomically fail (i.e. no other cleanly-merged paths are checked out either); * With "-f", other cleanly-merged paths are checked out, and unmerged paths are ignored; * With "--ours" or "--theirs, the contents from the specified stage is checked out; * With "-m" (we should add "--merge" as synonym), the 3-way merge is recreated from the staged object names and checked out. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-format.txt')
0 files changed, 0 insertions, 0 deletions