urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

todo item

master
Joey Hess 2007-10-31 17:48:02 -04:00
parent b8887c1cd7
commit 61c2030b2d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/todo/git_recentchanges_should_not_show_merges.mdwn 100644
View File

@ -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.