aboutsummaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-08 15:25:44 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-08 15:25:44 -0700
commit8bb65883d164843d5bb7475281af09bae18ab22d (patch)
tree7cf44a14a8aa1981ba814129948a4ed5918d3f88 /revision.h
parenta32a4eaa36527ab1c9a999357f9edd5e04591a4a (diff)
parent85af7929ee125385c2771fa4eaccfa2f29dc63c9 (diff)
downloadgit-8bb65883d164843d5bb7475281af09bae18ab22d.tar.gz
git-8bb65883d164843d5bb7475281af09bae18ab22d.tar.xz
Merge branch 'jc/blame' (early part) into HEAD
* 'jc/blame' (early part): git-blame --reverse builtin-blame.c: allow more than 16 parents builtin-blame.c: move prepare_final() into a separate function. rev-list --children revision traversal: --children option Conflicts: Documentation/rev-list-options.txt revision.c
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h
index abce5001f..dcf08e089 100644
--- a/revision.h
+++ b/revision.h
@@ -104,6 +104,7 @@ struct rev_info {
struct diff_options pruning;
struct reflog_walk_info *reflog_info;
+ struct decoration children;
};
#define REV_TREE_SAME 0