From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 31 Oct 2007 21:48:02 +0000 (-0400)
Subject: todo item
X-Git-Tag: 2.12~70
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/61c2030b2db03d2a83a210b2784fe25246c0be42?ds=sidebyside;hp=-c

todo item
---

61c2030b2db03d2a83a210b2784fe25246c0be42
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.