Merge branch 'jc/denoise-rm-to-resolve'
[gitweb.git] / unpack-trees.h
index 847f217dbaecea678f48d5086e7099c3c24a53c4..d344d7d29694dbf64d6874163810e65915167fd8 100644 (file)
@@ -45,6 +45,7 @@ struct unpack_trees_options {
        unsigned int reset,
                     merge,
                     update,
+                    clone,
                     index_only,
                     nontrivial_merge,
                     trivial_merges_only,
@@ -55,7 +56,7 @@ struct unpack_trees_options {
                     diff_index_cached,
                     debug_unpack,
                     skip_sparse_checkout,
-                    gently,
+                    quiet,
                     exiting_early,
                     show_all_errors,
                     dry_run;