Stephen Boyd wrote:
> 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,
> - diff_index_cached: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;
Sorry I went a little overboard with s/:1// on unpack_tree_options.
You'll probably want to squash this on top.
diff --git a/unpack-trees.h b/unpack-trees.h
index d19df44..f344679 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -21,14 +21,14 @@ struct unpack_trees_options {
merge,
update,
index_only,
- nontrivial_merge,
+ nontrivial_merge:1,
trivial_merges_only,
verbose_update,
aggressive,
- skip_unmerged,
- initial_checkout,
- diff_index_cached,
- gently;
+ skip_unmerged:1,
+ initial_checkout:1,
+ diff_index_cached:1,
+ gently:1;
const char *prefix;
int pos;
struct dir_struct *dir;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html