author | Junio C Hamano <gitster@pobox.com> | |
Tue, 16 Aug 2011 18:23:25 +0000 (11:23 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 16 Aug 2011 18:23:25 +0000 (11:23 -0700) |
* jc/diff-index-quick-exit-early:
diff-index --quiet: learn the "stop feeding the backend early" logic
Conflicts:
unpack-trees.h
diff-index --quiet: learn the "stop feeding the backend early" logic
Conflicts:
unpack-trees.h
1 | 2 | |||
---|---|---|---|---|
unpack-trees.c | patch | | diff1 | | diff2 | | blob | history |
unpack-trees.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc unpack-trees.c
Simple merge
diff --cc unpack-trees.h
index 64f02cb03ab242ac08ea0f1afbb24e71cf6664aa,4c6c54033e2d319a305e9a82d06e48e570f4f871..79989483079970e9dad42512e522eef8ea2a75a4
--- 1/unpack-trees.h
--- 2/unpack-trees.h
+++ b/unpack-trees.h
debug_unpack,
skip_sparse_checkout,
gently,
- show_all_errors;
+ exiting_early,
+ show_all_errors,
+ dry_run;
const char *prefix;
int cache_bottom;
struct dir_struct *dir;