summaryrefslogtreecommitdiffstats
path: root/contrib/workdir (unfollow)
Commit message (Expand)AuthorFilesLines
2007-04-01cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld1-3/+5
2007-04-01git-svn: fail on rebase if we are unable to find a ref to rebase againstEric Wong1-0/+3
2007-03-31Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen1-6/+31