summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
2010-09-27Improvements to `git checkout -h`Libravatar Daniel Knittl-Frank1-6/+6
2010-09-04Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano1-4/+17
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-2/+1
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+11
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy1-1/+0
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy1-1/+1
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy1-1/+1
2010-08-30checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesLibravatar Jens Lehmann1-0/+5
2010-08-25checkout: respect diff.ignoreSubmodules settingLibravatar Johannes Schindelin1-4/+12
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-1/+2
2010-08-20builtin/checkout: Fix message when switching to an existing branchLibravatar Ramkumar Ramachandra1-1/+4
2010-08-18Merge branch 'jn/fix-abbrev'Libravatar Junio C Hamano1-1/+0
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-0/+1
2010-08-11merge-recursive: porcelain messages for checkoutLibravatar Diane Gasselin1-1/+1
2010-08-11Turn unpack_trees_options.msgs into an array + enumLibravatar Matthieu Moy1-1/+1
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-0/+7
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-0/+4
2010-07-27checkout, commit: remove confusing assignments to rev.abbrevLibravatar Jonathan Nieder1-1/+0
2010-06-25builtin/checkout: learn -BLibravatar Tay Ray Chuan1-5/+24
2010-06-25builtin/checkout: reword hint for -bLibravatar Tay Ray Chuan1-1/+2
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano1-1/+2
2010-06-12log_ref_setup: don't return stack-allocated arrayLibravatar Thomas Rast1-2/+2
2010-06-03checkout --orphan: respect -l option alwaysLibravatar Erick Mattos1-3/+28
2010-05-31Rewrite dynamic structure initializations to runtime assignmentLibravatar Gary V. Vaughan1-1/+2
2010-05-21Merge branch 'em/checkout-orphan'Libravatar Junio C Hamano1-2/+13
2010-03-21git checkout: create unparented branch by --orphanLibravatar Erick Mattos1-2/+13
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