diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2008-02-07 11:40:02 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-09 23:16:51 -0800 |
| commit | 4e7c4571b8b31d6a09de2826361540caa76d3526 (patch) | |
| tree | 5a1ad8a393ca1408bbf252b4842a3fd82c03959e /unpack-trees.h | |
| parent | 33ecf7eb6143143711ccaf828134beb2dacbe5c9 (diff) | |
| download | git-4e7c4571b8b31d6a09de2826361540caa76d3526.tar.gz git-4e7c4571b8b31d6a09de2826361540caa76d3526.tar.xz | |
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>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 83d122953..a2df544d0 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -16,6 +16,7 @@ struct unpack_trees_options { int trivial_merges_only; int verbose_update; int aggressive; + int skip_unmerged; int gently; const char *prefix; int pos; |