diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 18:23:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 18:23:25 (GMT) |
| commit | f253376dcbadb384d8c8af287c3f9e2271cb5ff4 (patch) | |
| tree | 32382322a78e71a1552daec2d64582647e2190e1 /unpack-trees.h | |
| parent | e10e476fb170a99ecc535a31def69d5e3483a859 (diff) | |
| parent | b4194828dc00e97dcd07ecb4bb4f87650a6fca1d (diff) | |
| download | git-f253376dcbadb384d8c8af287c3f9e2271cb5ff4.zip git-f253376dcbadb384d8c8af287c3f9e2271cb5ff4.tar.gz git-f253376dcbadb384d8c8af287c3f9e2271cb5ff4.tar.bz2 | |
Merge branch 'jc/diff-index-quick-exit-early' into maint
* 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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 64f02cb..7998948 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; |