Merge branch 'lt/decorate'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:51:19 +0000 (21:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:51:19 +0000 (21:51 -0800)
commitb2b80c107f6db4c3297af59fd2fb40ada5899778
treebf47fd6d9aa703fbcf46aba8e38c2069cd8c0324
parent72b6157aa847615a778ac9950e87dde109afa50c
parent7bc2508bfe0f7e8c0371a68f57ac5b7d4fe7e1f0
Merge branch 'lt/decorate'

* lt/decorate:
  rev-list documentation: clarify the two parts of history simplification
  Document "git log --simplify-by-decoration"
  Document "git log --source"
  revision traversal: '--simplify-by-decoration'
  Make '--decorate' set an explicit 'show_decorations' flag
  revision: make tree comparison functions take commits rather than trees
  Add a 'source' decorator for commits

Conflicts:
Documentation/rev-list-options.txt
Documentation/rev-list-options.txt
builtin-log.c