summaryrefslogtreecommitdiffstats
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-29 17:03:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-29 17:03:11 -0700
commit57e4d61686b20ef3ad4982753407cf0bd87335f2 (patch)
tree4a93746a700898c457f3d0be64d65cfa7dd6d086 /unpack-trees.h
parenta852aac48d881d538e24d5493e218a93b12b1709 (diff)
parentb4194828dc00e97dcd07ecb4bb4f87650a6fca1d (diff)
downloadgit-57e4d61686b20ef3ad4982753407cf0bd87335f2.tar.gz
git-57e4d61686b20ef3ad4982753407cf0bd87335f2.tar.xz
Merge branch 'jc/diff-index-quick-exit-early'
* jc/diff-index-quick-exit-early: diff-index --quiet: learn the "stop feeding the backend early" logic Conflicts: unpack-trees.h
Diffstat (limited to 'unpack-trees.h')
-rw-r--r--unpack-trees.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 64f02cb03..799894830 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -46,6 +46,7 @@ struct unpack_trees_options {
debug_unpack,
skip_sparse_checkout,
gently,
+ exiting_early,
show_all_errors,
dry_run;
const char *prefix;