Merge branch 'master' of https://github.com/vnwildman/git

[thirdparty/git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index 0135080a7b4e91713b66f68669e57a2f5e4edbdd..d344d7d29694dbf64d6874163810e65915167fd8 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -56,7 +56,7 @@ struct unpack_trees_options {
                     diff_index_cached,
                     debug_unpack,
                     skip_sparse_checkout,
-                    gently,
+                    quiet,
                     exiting_early,
                     show_all_errors,
                     dry_run;