Merge branch 'tr/format-patch-thread'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Mar 2009 20:48:07 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Mar 2009 20:48:07 +0000 (13:48 -0700)
commit5a5bd23486c5d8721f4654eadec75213d3dc074f
tree51a0d4bf4b3277c010fe623f55e32c5824994eef
parent72e3c32bef0574ec6febc5e815b0467f892ef7e2
parent30984ed2e92651962c6b8bdacf1f84da75d1da95
Merge branch 'tr/format-patch-thread'

* tr/format-patch-thread:
  format-patch: support deep threading
  format-patch: thread as reply to cover letter even with in-reply-to
  format-patch: track several references
  format-patch: threading test reactivation

Conflicts:
builtin-log.c
Documentation/git-format-patch.txt
builtin-log.c
log-tree.c