| commit | 4e7c4571b8b31d6a09de2826361540caa76d3526 | |
| author | Daniel Barkalow <barkalow@iabervon.org> | |
| Thu, 7 Feb 2008 16:40:02 +0000 (7 11:40 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Feb 2008 07:16:51 +0000 (9 23:16 -0800) | ||
| tree | 5a1ad8a393ca1408bbf252b4842a3fd82c03959e | treesnapshot (tar.gz zip) |
| parent | 33ecf7eb6143143711ccaf828134beb2dacbe5c9 | commitdiff |
Add "skip_unmerged" option to unpack_trees.
This option allows the caller to reset everything that isn't unmerged,
leaving the unmerged things to be resolved. If, after a merge of
"working" and "HEAD", this is used with "HEAD" (reset, !update), the
result will be that all of the changes from "local" are in the working
tree but not added to the index (either with the index clean but
unchanged, or with the index unmerged, depending on whether there are
conflicts).
This will be used in checkout -m.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
This option allows the caller to reset everything that isn't unmerged,
leaving the unmerged things to be resolved. If, after a merge of
"working" and "HEAD", this is used with "HEAD" (reset, !update), the
result will be that all of the changes from "local" are in the working
tree but not added to the index (either with the index clean but
unchanged, or with the index unmerged, depending on whether there are
conflicts).
This will be used in checkout -m.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
| unpack-trees.c | diffblobblamehistory | |
| unpack-trees.h | diffblobblamehistory |