Merge branch 'jc/topo-author-date-sort' into next
commitad4fb48b8df374c362648912335b029b54afaac4
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Jun 2013 05:14:09 +0000 (15 22:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Jun 2013 05:14:09 +0000 (15 22:14 -0700)
tree6b3ca7add17cddd76a3866ccbbfdf811774c863e
parent908ab9383bec811fb09342d4f466b5cb3d6736b0
parent81c6b38b67019eff48e8e5c324bb77f6c796c0b5
Merge branch 'jc/topo-author-date-sort' into next

"git log" learned the "--author-date-order" option, with which the
output is topologically sorted and commits in parallel histories
are shown intermixed together based on the author timestamp.

* jc/topo-author-date-sort:
  log: --author-date-order
  sort-in-topological-order: use prio-queue
  prio-queue: priority queue of pointers to structs
  toposort: rename "lifo" field
.gitignore
Documentation/rev-list-options.txt
Makefile
builtin/log.c
builtin/show-branch.c
commit.c
commit.h
revision.c
revision.h