From: Junio C Hamano Date: Fri, 08 Jun 2012 22:53:26 GMT Subject: [PATCH 0/3] rev-list --simplify-{merges,by-decoration} --first-parent Message-ID: <1339196009-14555-1-git-send-email-gitster@pobox.com> The deeper history simplification using merge information (not to be confused with "merge simplification") was not prepared to be used with the --first-parent option, but it was possible to trigger this combination from gitk. The fix is fairly straight-forward. When showing only first-parent chain of history, the later parents won't matter in the result, so we can just rewrite the parents and make the history a single strand of pearls. Showing first-parent-only history and then attempting to simplify merges does not make much sense, but simplify-by-decoration may be a valid thing to ask. Junio C Hamano (3): revision: "simplify" options imply topo-order sort revision: note the lack of free() in simplify_merges() revision: cull side parents before running simplify-merges revision.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) -- 1.7.11.rc2.29.g85b30f3