]> sipb.mit.edu Git - ikiwiki.git/commit
only_committed_changes could fail in a git repository merged with git merge -s ours.
authorJoey Hess <joey@kitenet.net>
Sat, 5 Apr 2014 23:09:05 +0000 (19:09 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 5 Apr 2014 23:09:05 +0000 (19:09 -0400)
commit59cfb9b6d0f5f60516d17c79365318711a92fb04
tree388f7376e07140dd88a3dcc0aaa2ac909776e5d1
parent9989114c1f662ddbdf3970be7324c97d0f59c9e5
only_committed_changes could fail in a git repository merged with git merge -s ours.
IkiWiki/Plugin/git.pm
debian/changelog