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)
* 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

1  2 
Documentation/rev-list-options.txt
builtin-log.c

Simple merge
diff --cc builtin-log.c
Simple merge