aboutsummaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAge
* checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
* checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
* ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-20
* Merge branch 'lt/deepen-builtin-source'Junio C Hamano2010-03-10
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22