diff options
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 0d26f3d73e..d19df44f40 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -17,17 +17,18 @@ struct unpack_trees_error_msgs { }; struct unpack_trees_options { - unsigned int reset:1, - merge:1, - update:1, - index_only:1, - nontrivial_merge:1, - trivial_merges_only:1, - verbose_update:1, - aggressive:1, - skip_unmerged:1, - initial_checkout:1, - gently:1; + unsigned int reset, + merge, + update, + index_only, + nontrivial_merge, + trivial_merges_only, + verbose_update, + aggressive, + skip_unmerged, + initial_checkout, + diff_index_cached, + gently; const char *prefix; int pos; struct dir_struct *dir; |