summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-10-31 17:48:02 -0400
committerJoey Hess <joey@kodama.kitenet.net>2007-10-31 17:48:02 -0400
commit61c2030b2db03d2a83a210b2784fe25246c0be42 (patch)
treee3e04546e9b9446b6a541f8c6bfe9acad549137c /doc
parentb8887c1cd7d3134561f0d99ffdcc75d7bf63e234 (diff)
todo item
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/git_recentchanges_should_not_show_merges.mdwn9
1 files changed, 9 insertions, 0 deletions
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.