From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Nov 2008 05:51:19 +0000 (-0800)
Subject: Merge branch 'lt/decorate'
X-Git-Tag: v1.6.1-rc1~61
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b2b80c107f6db4c3297af59fd2fb40ada5899778;p=git.git

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

b2b80c107f6db4c3297af59fd2fb40ada5899778