From 61c2030b2db03d2a83a210b2784fe25246c0be42 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 31 Oct 2007 17:48:02 -0400 Subject: [PATCH 1/1] todo item --- doc/todo/git_recentchanges_should_not_show_merges.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/todo/git_recentchanges_should_not_show_merges.mdwn diff --git a/doc/todo/git_recentchanges_should_not_show_merges.mdwn b/doc/todo/git_recentchanges_should_not_show_merges.mdwn new file mode 100644 index 000000000..22cf1c08f --- /dev/null +++ b/doc/todo/git_recentchanges_should_not_show_merges.mdwn @@ -0,0 +1,9 @@ +The recentchanges page can currently display merge commits, such as "Merge +branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info". + +It should filter these out somehow, but I'm not sure how to do that. + +A merge in general is a commit with two parents, right? But such a merge +might be what gitweb calls a "simple merge", that is I think, just a +fast-forward. Or it could be a merge that includes manual conflict resolution, +and should be shown in recentchanges. -- 2.39.2