diff options
| author |  Kevin Bracey <kevin@bracey.fi> | 2013-05-16 18:32:40 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-16 11:51:10 -0700 |
| commit | bf3418b08bac89902a5f6c70f8695f148df99828 (patch) | |
| tree | 6b2f5d7fec00f019abf2afea302f419477fe4fa6 /ll-merge.h | |
| parent | revision.c: discount side branches when computing TREESAME (diff) | |
| download | tgif-bf3418b08bac89902a5f6c70f8695f148df99828.tar.xz | |
revision.c: don't show all merges for --parents
When using --parents or --children, get_commit_action() previously showed
all merges, even if TREESAME to both parents.
This was intended to tie together the topology of the rewritten parents,
but it was excessive - in fact we only need to show merges that have two
or more relevant parents. Merges at the boundary do not necessarily need
to be shown.
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions