summaryrefslogtreecommitdiffstats
path: root/utf8.c (unfollow)
Commit message (Expand)AuthorFilesLines
2010-01-04Fix bit assignment for CE_CONFLICTEDJunio C Hamano1-1/+1
2010-01-04"reset --merge": fix unmerged caseJunio C Hamano5-20/+49
2010-01-04reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer3-17/+38