Merge branch 'jc/blame' (early part) into HEAD
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jul 2008 22:25:44 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jul 2008 22:25:44 +0000 (15:25 -0700)
commit8bb65883d164843d5bb7475281af09bae18ab22d
tree7cf44a14a8aa1981ba814129948a4ed5918d3f88
parenta32a4eaa36527ab1c9a999357f9edd5e04591a4a
parent85af7929ee125385c2771fa4eaccfa2f29dc63c9
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
Documentation/rev-list-options.txt
builtin-blame.c
builtin-rev-list.c
revision.c
revision.h