From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Jun 2013 15:45:59 +0000 (-0700)
Subject: Merge branch 'kb/full-history-compute-treesame-carefully-2'
X-Git-Tag: v1.8.4-rc0~171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b27a79d16b21be064c0ac3634928a91e3eee5c01;p=thirdparty%2Fgit.git

Merge branch 'kb/full-history-compute-treesame-carefully-2'

Major update to the revision traversal logic to improve culling of
irrelevant parents while traversing a mergy history.

* kb/full-history-compute-treesame-carefully-2:
  revision.c: make default history consider bottom commits
  revision.c: don't show all merges for --parents
  revision.c: discount side branches when computing TREESAME
  revision.c: add BOTTOM flag for commits
  simplify-merges: drop merge from irrelevant side branch
  simplify-merges: never remove all TREESAME parents
  t6012: update test for tweaked full-history traversal
  revision.c: Make --full-history consider more merges
  Documentation: avoid "uninteresting"
  rev-list-options.txt: correct TREESAME for P
  t6111: add parents to tests
  t6111: allow checking the parents as well
  t6111: new TREESAME test set
  t6019: test file dropped in -s ours merge
  decorate.c: compact table when growing
---

b27a79d16b21be064c0ac3634928a91e3eee5c01