aboutsummaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAge
* Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-03
* setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-03
* Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03
* unpack_trees: group error messages by typeMatthieu Moy2010-08-11
* merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-11
* Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-11
* Merge branch 'gv/portable'Junio C Hamano2010-06-21
|\
| * Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-31
* | log_ref_setup: don't return stack-allocated arrayThomas Rast2010-06-12
* | checkout --orphan: respect -l option alwaysErick Mattos2010-06-03
* | Merge branch 'em/checkout-orphan'Junio C Hamano2010-05-21
|\ \ | |/ |/|
| * git checkout: create unparented branch by --orphanErick Mattos2010-03-21
* | 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