summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
2010-03-20checkout -m --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20checkout --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-1/+1
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-1/+1
2010-03-10Merge branch 'lt/deepen-builtin-source'Libravatar Junio C Hamano1-0/+835
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+853