todo item

[ikiwiki.git] / 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 (file)
index 0000000..22cf1c0
--- /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.