]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'kb/full-history-compute-treesame-carefully-2'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:45:59 +0000 (08:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:45:59 +0000 (08:45 -0700)
commitb27a79d16b21be064c0ac3634928a91e3eee5c01
treee9f75de0da78552765dc5fae1451402e78c36797
parent91d34bc47ba6ed51a35fa3bb84d674b624d3f447
parent141efdba57b1769fc60ff9a3925afbc6af398faf
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
revision.c
revision.h