summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
AgeCommit message (Expand)Author
2010-01-21Merge branch 'jc/checkout-merge-base'Junio C Hamano
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano
2010-01-20Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsJunio C Hamano
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano
2010-01-13Merge branch 'jc/checkout-merge-base'Junio C Hamano
2010-01-10Merge branch 'maint-1.6.2' into maintJunio C Hamano
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano
2010-01-07checkout -m: do not try to fall back to --merge from an unborn branchJunio C Hamano
2010-01-06checkout -m path: fix recreating conflictsJunio C Hamano
2009-12-26resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano
2009-12-26resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano
2009-10-31fixup tr/stash-format mergeJunio C Hamano
2009-10-21git checkout --no-guessJunio C Hamano
2009-10-20Refactor pretty_print_commit arguments into a structThomas Rast
2009-10-18"checkout A...B" switches to the merge base between A and BJunio C Hamano
2009-10-18DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"Junio C Hamano
2009-09-07Merge branch 'tr/reset-checkout-patch'Junio C Hamano
2009-08-29UI consistency: allow --force for where -f means forceRené Scharfe
2009-08-29Merge branch 'jk/maint-1.6.3-checkout-unborn'Junio C Hamano
2009-08-25checkout: do not imply "-f" on unborn branchesJeff King
2009-08-15Implement 'git checkout --patch'Thomas Rast
2009-05-26Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd
2009-05-23Merge branch 'lt/maint-diff-reduce-lstat'Junio C Hamano
2009-05-16builtin-checkout: Don't tell user that HEAD has moved before it hasDaniel Cordero
2009-05-12Merge branch 'maint-1.6.2' into maintJunio C Hamano
2009-05-12Revert "checkout branch: prime cache-tree fully"Junio C Hamano
2009-05-10Teach 'git checkout' to preload the index contentsLinus Torvalds
2009-04-23Merge branch 'jc/maint-read-tree-multi'Junio C Hamano
2009-04-23Fix typos / spelling in commentsMike Ralphson
2009-04-20checkout branch: prime cache-tree fullyJunio C Hamano
2009-04-20Move prime_cache_tree() to cache-tree.cJunio C Hamano
2009-04-18Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano
2009-04-08Merge branch 'maint'Junio C Hamano
2009-04-08Change double quotes to single quotes in messageJari Aalto
2009-04-08Merge branch 'js/maint-submodule-checkout'Junio C Hamano
2009-04-06Merge branch 'jc/name-branch'Junio C Hamano
2009-04-02Fix 'git checkout <submodule>' to update the indexJohannes Schindelin
2009-03-24builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")Miklos Vajna
2009-03-23strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano
2009-03-23strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano
2009-03-23Rename interpret/substitute nth_last_branch functionsJunio C Hamano
2009-03-20Merge branch 'mv/parseopt-ls-files'Junio C Hamano
2009-03-04Fix neglect of diff_setup()/diff_setup_done() symmetry.Keith Cascio
2009-02-18Turn the flags in struct dir_struct into a single variableJohannes Schindelin
2009-01-28Merge branch 'tr/previous-branch'Junio C Hamano
2009-01-26Merge branch 'cb/add-pathspec'Junio C Hamano
2009-01-18checkout: implement "-" abbreviation, add docs and testsThomas Rast
2009-01-18sha1_name: tweak @{-N} lookupThomas Rast