From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Aug 2008 04:40:05 +0000 (-0700)
Subject: Merge branch 'jc/post-simplify' into tr/rev-list-docs
X-Git-Tag: v1.6.1-rc1~275^2^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/00b718e02d97c956cade8c1b4cbe29a9d3e92765?hp=00b718e02d97c956cade8c1b4cbe29a9d3e92765

Merge branch 'jc/post-simplify' into tr/rev-list-docs

* jc/post-simplify:
Topo-sort before --simplify-merges
revision traversal: show full history with merge simplification
revision.c: whitespace fix

Conflicts:
Documentation/rev-list-options.txt
---