summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+2
|\
| * Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-1/+2
* | log_ref_setup: don't return stack-allocated arrayThomas Rast2010-06-121-2/+2
* | checkout --orphan: respect -l option alwaysErick Mattos2010-06-031-3/+28
* | Merge branch 'em/checkout-orphan'Junio C Hamano2010-05-211-2/+13
|\ \ | |/ |/|
| * git checkout: create unparented branch by --orphanErick Mattos2010-03-211-2/+13
* | checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-0/+1
* | checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-1/+1
* | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-1/+1
|/
* Merge branch 'lt/deepen-builtin-source'Junio C Hamano2010-03-101-21/+3
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+853