diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-14 08:45:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-14 08:45:59 -0700 |
| commit | b27a79d16b21be064c0ac3634928a91e3eee5c01 (patch) | |
| tree | e9f75de0da78552765dc5fae1451402e78c36797 /t/t3505-cherry-pick-empty.sh | |
| parent | Merge branch 'rr/remove-contrib-some' (diff) | |
| parent | revision.c: make default history consider bottom commits (diff) | |
| download | tgif-b27a79d16b21be064c0ac3634928a91e3eee5c01.tar.xz | |
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
Diffstat (limited to 't/t3505-cherry-pick-empty.sh')
0 files changed, 0 insertions, 0 deletions