summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)Author
2010-09-04Merge branch 'jl/submodule-ignore-diff'Junio C Hamano
2010-09-04Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy
2010-08-30checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann
2010-08-25checkout: respect diff.ignoreSubmodules settingJohannes Schindelin
2010-08-22Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-08-20builtin/checkout: Fix message when switching to an existing branchRamkumar Ramachandra
2010-08-18Merge branch 'jn/fix-abbrev'Junio C Hamano
2010-08-11unpack_trees: group error messages by typeMatthieu Moy
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy
2010-08-06merge-recursive --renormalizeJonathan Nieder
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder
2010-07-27checkout, commit: remove confusing assignments to rev.abbrevJonathan Nieder
2010-06-25builtin/checkout: learn -BTay Ray Chuan
2010-06-25builtin/checkout: reword hint for -bTay Ray Chuan
2010-06-21Merge branch 'gv/portable'Junio C Hamano
2010-06-12log_ref_setup: don't return stack-allocated arrayThomas Rast
2010-06-03checkout --orphan: respect -l option alwaysErick Mattos
2010-05-31Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan
2010-05-21Merge branch 'em/checkout-orphan'Junio C Hamano
2010-03-21git checkout: create unparented branch by --orphanErick Mattos
2010-03-21checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21checkout --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-03-10Merge branch 'lt/deepen-builtin-source'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds