summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
AgeCommit message (Expand)AuthorFilesLines
2010-01-20Merge branch 'jc/checkout-merge-base'Libravatar Junio C Hamano1-2/+4
2010-01-20Merge branch 'jc/cache-unmerge'Libravatar Junio C Hamano1-0/+6
2010-01-19Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsLibravatar Junio C Hamano1-2/+4
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Libravatar Junio C Hamano1-1/+1
2010-01-13Merge branch 'jc/checkout-merge-base'Libravatar Junio C Hamano1-2/+5
2010-01-10Merge branch 'maint-1.6.2' into maintLibravatar Junio C Hamano1-2/+8
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Libravatar Junio C Hamano1-2/+8
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-2/+8
2010-01-06checkout -m: do not try to fall back to --merge from an unborn branchLibravatar Junio C Hamano1-2/+8
2010-01-06checkout -m path: fix recreating conflictsLibravatar Junio C Hamano1-1/+1
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+4
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionLibravatar Junio C Hamano1-0/+2
2009-10-30fixup tr/stash-format mergeLibravatar Junio C Hamano1-1/+2
2009-10-21git checkout --no-guessLibravatar Junio C Hamano1-0/+5
2009-10-19Refactor pretty_print_commit arguments into a structLibravatar Thomas Rast1-1/+2
2009-10-18"checkout A...B" switches to the merge base between A and BLibravatar Junio C Hamano1-2/+5
2009-10-18DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"Libravatar Junio C Hamano1-3/+57
2009-09-07Merge branch 'tr/reset-checkout-patch'Libravatar Junio C Hamano1-0/+19
2009-08-29UI consistency: allow --force for where -f means forceLibravatar René Scharfe1-1/+1
2009-08-28Merge branch 'jk/maint-1.6.3-checkout-unborn'Libravatar Junio C Hamano1-9/+3
2009-08-25checkout: do not imply "-f" on unborn branchesLibravatar Jeff King1-9/+3
2009-08-15Implement 'git checkout --patch'Libravatar Thomas Rast1-0/+19
2009-05-25Merge branch 'lt/maint-diff-reduce-lstat' into maintLibravatar Junio C Hamano1-2/+2
2009-05-25parse-opts: prepare for OPT_FILENAMELibravatar Stephen Boyd1-1/+1
2009-05-23Merge branch 'lt/maint-diff-reduce-lstat'Libravatar Junio C Hamano1-2/+2
2009-05-16builtin-checkout: Don't tell user that HEAD has moved before it hasLibravatar Daniel Cordero1-8/+8
2009-05-12Merge branch 'maint-1.6.2' into maintLibravatar Junio C Hamano1-8/+1
2009-05-12Revert "checkout branch: prime cache-tree fully"Libravatar Junio C Hamano1-8/+1
2009-05-09Teach 'git checkout' to preload the index contentsLibravatar Linus Torvalds1-2/+2
2009-04-22Merge branch 'jc/maint-read-tree-multi'Libravatar Junio C Hamano1-1/+9
2009-04-22Fix typos / spelling in commentsLibravatar Mike Ralphson1-1/+1
2009-04-20checkout branch: prime cache-tree fullyLibravatar Junio C Hamano1-1/+8
2009-04-20Move prime_cache_tree() to cache-tree.cLibravatar Junio C Hamano1-0/+1
2009-04-18Merge branch 'js/maint-submodule-checkout' into maintLibravatar Junio C Hamano1-3/+0
2009-04-07Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2009-04-07Change double quotes to single quotes in messageLibravatar Jari Aalto1-3/+3
2009-04-07Merge branch 'js/maint-submodule-checkout'Libravatar Junio C Hamano1-3/+0
2009-04-06Merge branch 'jc/name-branch'Libravatar Junio C Hamano1-12/+6
2009-04-02Fix 'git checkout <submodule>' to update the indexLibravatar Johannes Schindelin1-3/+0
2009-03-23builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")Libravatar Miklos Vajna1-2/+2
2009-03-22strbuf_check_branch_ref(): a helper to check a refname for a branchLibravatar Junio C Hamano1-4/+3
2009-03-22strbuf_branchname(): a wrapper for branch name shorthandsLibravatar Junio C Hamano1-8/+3
2009-03-22Rename interpret/substitute nth_last_branch functionsLibravatar Junio C Hamano1-1/+1
2009-03-20Merge branch 'mv/parseopt-ls-files'Libravatar Junio C Hamano1-1/+1
2009-03-04Fix neglect of diff_setup()/diff_setup_done() symmetry.Libravatar Keith Cascio1-0/+2
2009-02-18Turn the flags in struct dir_struct into a single variableLibravatar Johannes Schindelin1-1/+1
2009-01-28Merge branch 'tr/previous-branch'Libravatar Junio C Hamano1-2/+13
2009-01-25Merge branch 'cb/add-pathspec'Libravatar Junio C Hamano1-3/+3
2009-01-17checkout: implement "-" abbreviation, add docs and testsLibravatar Thomas Rast1-0/+3
2009-01-17sha1_name: tweak @{-N} lookupLibravatar Thomas Rast1-1/+3