summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2009-10-19 12:38:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-20 05:31:00 (GMT)
commit752c0c24926aacbceca0d27de6ad22cbb7dd0709 (patch)
tree94fb54e076f11d2ef66d888cd8493e1520639ef3 /diff.h
parentdbc1b1f71052c084a84b5c395e1cb4b5ae526fcb (diff)
downloadgit-752c0c24926aacbceca0d27de6ad22cbb7dd0709.zip
git-752c0c24926aacbceca0d27de6ad22cbb7dd0709.tar.gz
git-752c0c24926aacbceca0d27de6ad22cbb7dd0709.tar.bz2
Add the --submodule option to the diff option family
When you use the option --submodule=log you can see the submodule summaries inlined in the diff, instead of not-quite-helpful SHA-1 pairs. The format imitates what "git submodule summary" shows. To do that, <path>/.git/objects/ is added to the alternate object databases (if that directory exists). This option was requested by Jens Lehmann at the GitTogether in Berlin. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 6616877..2740421 100644
--- a/diff.h
+++ b/diff.h
@@ -66,6 +66,9 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
+
+#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
+
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
#define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag)