aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-checkout.c
AgeCommit message (Expand)AuthorFilesLines
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-853/+0
2010-01-29Reword "detached HEAD" notificationJunio C Hamano1-2/+16
2010-01-20Merge branch 'jc/checkout-merge-base'Junio C Hamano1-2/+4
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano1-0/+6
2010-01-19Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsJunio C Hamano1-2/+4
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano1-1/+1
2010-01-13Merge branch 'jc/checkout-merge-base'Junio C Hamano1-2/+5
2010-01-10Merge branch 'maint-1.6.2' into maintJunio C Hamano1-2/+8
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano1-2/+8
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-2/+8
2010-01-06checkout -m: do not try to fall back to --merge from an unborn branchJunio C Hamano1-2/+8
2010-01-06checkout -m path: fix recreating conflictsJunio C Hamano1-1/+1
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano1-0/+4
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano1-0/+2
2009-10-30fixup tr/stash-format mergeJunio C Hamano1-1/+2
2009-10-21git checkout --no-guessJunio C Hamano1-0/+5
2009-10-19Refactor pretty_print_commit arguments into a structThomas Rast1-1/+2
2009-10-18"checkout A...B" switches to the merge base between A and BJunio C Hamano1-2/+5
2009-10-18DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"Junio C Hamano1-3/+57
2009-09-07Merge branch 'tr/reset-checkout-patch'Junio C Hamano1-0/+19
2009-08-29UI consistency: allow --force for where -f means forceRené Scharfe1-1/+1
2009-08-28Merge branch 'jk/maint-1.6.3-checkout-unborn'Junio C Hamano1-9/+3
2009-08-25checkout: do not imply "-f" on unborn branchesJeff King1-9/+3
2009-08-15Implement 'git checkout --patch'Thomas Rast1-0/+19
2009-05-25Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano1-2/+2
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd1-1/+1
2009-05-23Merge branch 'lt/maint-diff-reduce-lstat'Junio C Hamano1-2/+2
2009-05-16builtin-checkout: Don't tell user that HEAD has moved before it hasDaniel Cordero1-8/+8
2009-05-12Merge branch 'maint-1.6.2' into maintJunio C Hamano1-8/+1
2009-05-12Revert "checkout branch: prime cache-tree fully"Junio C Hamano1-8/+1
2009-05-09Teach 'git checkout' to preload the index contentsLinus Torvalds1-2/+2
2009-04-22Merge branch 'jc/maint-read-tree-multi'Junio C Hamano1-1/+9
2009-04-22Fix typos / spelling in commentsMike Ralphson1-1/+1
2009-04-20checkout branch: prime cache-tree fullyJunio C Hamano1-1/+8
2009-04-20Move prime_cache_tree() to cache-tree.cJunio C Hamano1-0/+1
2009-04-18Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano1-3/+0
2009-04-07Merge branch 'maint'Junio C Hamano1-3/+3
2009-04-07Change double quotes to single quotes in messageJari Aalto1-3/+3
2009-04-07Merge branch 'js/maint-submodule-checkout'Junio C Hamano1-3/+0
2009-04-06Merge branch 'jc/name-branch'Junio C Hamano1-12/+6
2009-04-02Fix 'git checkout <submodule>' to update the indexJohannes Schindelin1-3/+0
2009-03-23builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")Miklos Vajna1-2/+2
2009-03-22strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano1-4/+3
2009-03-22strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano1-8/+3
2009-03-22Rename interpret/substitute nth_last_branch functionsJunio C Hamano1-1/+1
2009-03-20Merge branch 'mv/parseopt-ls-files'Junio C Hamano1-1/+1
2009-03-04Fix neglect of diff_setup()/diff_setup_done() symmetry.Keith Cascio1-0/+2
2009-02-18Turn the flags in struct dir_struct into a single variableJohannes Schindelin1-1/+1
2009-01-28Merge branch 'tr/previous-branch'Junio C Hamano1-2/+13
2009-01-25Merge branch 'cb/add-pathspec'Junio C Hamano1-3/+3
2009-01-17checkout: implement "-" abbreviation, add docs and testsThomas Rast1-0/+3
2009-01-17sha1_name: tweak @{-N} lookupThomas Rast1-1/+3
2009-01-17checkout: implement "@{-N}" shortcut name for N-th last branchJunio C Hamano1-2/+8
2009-01-17Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer1-17/+5
2009-01-17checkout: don't crash on file checkout before running post-checkout hookStephan Beyer1-2/+4
2009-01-14remove pathspec_match, use match_pathspec insteadClemens Buchacher1-3/+3
2009-01-11Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano1-1/+1
2009-01-03Merge branch 'jc/maint-do-not-switch-to-non-commit'Junio C Hamano1-1/+1
2009-01-03git checkout: do not allow switching to a tree-ish that is not a commitJunio C Hamano1-1/+1
2008-12-07builtin-checkout.c: check error return from read_cache()Junio C Hamano1-2/+5
2008-11-27Merge branch 'maint'Junio C Hamano1-1/+1
2008-11-27git checkout: don't warn about unborn branch if -f is already passedMatt McCutchen1-1/+1
2008-11-12Merge branch 'maint'Junio C Hamano1-2/+1
2008-11-12checkout: Fix "initial checkout" detectionJunio C Hamano1-2/+1
2008-11-09Merge branch 'maint'Junio C Hamano1-4/+4
2008-11-09checkout: Don't crash when switching away from an invalid branch.Alexandre Julliard1-4/+4
2008-10-19Fix mismerge at cdb22c4 in builtin-checkout.cJunio C Hamano1-3/+0
2008-10-18Merge branch 'db/maint-checkout-b' into maintJunio C Hamano1-0/+12
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-8/+4
2008-10-06do not segfault if make_cache_entry failedDmitry Potapov1-0/+2
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce1-21/+173
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce1-3/+8
2008-09-25Merge branch 'maint'Shawn O. Pearce1-1/+1
2008-09-25checkout: Do not show local changes when in quiet modeJonas Fonseca1-1/+1
2008-09-21Merge branch 'db/maint-checkout-b'Junio C Hamano1-0/+12
2008-09-21Check early that a new branch is new and validDaniel Barkalow1-0/+12
2008-09-18Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano1-0/+2
2008-09-16Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano1-0/+2
2008-09-10Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano1-1/+28
2008-09-09checkout: do not lose staged removalJunio C Hamano1-0/+2
2008-09-07Merge branch 'jc/maint-checkout-fix'Junio C Hamano1-1/+28
2008-09-03Merge branch 'maint'Junio C Hamano1-6/+4
2008-09-03checkout: fix message when leaving detached HEADJeff King1-6/+4
2008-08-31checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano1-1/+9
2008-08-30merge-recursive: introduce merge_optionsMiklos Vajna1-3/+8
2008-08-30checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano1-2/+102
2008-08-30checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano1-1/+38
2008-08-30checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano1-18/+23
2008-08-30checkout: do not check out unmerged higher stages randomlyJunio C Hamano1-1/+28
2008-08-22Extend "checkout --track" DWIM to support more casesAlex Riesen1-13/+13
2008-08-11checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin1-3/+18
2008-07-24git-checkout: improve error messages, detect ambiguities.Pierre Habouzit1-17/+65
2008-07-23Merge branch 'maint' into ph/checkoutJunio C Hamano1-1/+2
2008-07-23git-checkout: fix command line parsing.Pierre Habouzit1-1/+2
2008-07-15add context pointer to read_tree_recursive()René Scharfe1-2/+2
2008-07-02Refactor "tracking statistics" code used by "git checkout"Junio C Hamano1-88/+6
2008-05-29checkout: "best effort" checkoutJunio C Hamano1-4/+18
2008-05-29checkout: consolidate reset_{to_new,clean_to_new}()Junio C Hamano1-35/+15
2008-05-28checkout: make reset_clean_to_new() not die by itselfJunio C Hamano1-3/+6
2008-05-28"git checkout -- paths..." should error out when paths cannot be writtenJunio C Hamano1-2/+5
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano1-1/+1
2008-05-25Merge branch 'jc/unpack-trees-reword'Junio C Hamano1-0/+2
2008-05-19unpack-trees: allow Porcelain to give different error messagesJunio C Hamano1-0/+2
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin1-1/+1
2008-05-12Extend interface of add_files_to_cache to allow ignore indexing errorsAlex Riesen1-1/+1
2008-05-03Merge branch 'maint'Junio C Hamano1-1/+1
2008-05-03checkout: don't rfc2047-encode oneline on detached HEADJeff King1-1/+1
2008-04-27git checkout: add -t alias for --trackMiklos Vajna1-1/+1
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds1-3/+6
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds1-0/+6
2008-03-02cleanup: remove unused git_checkout_configDenis Cheng1-6/+1
2008-02-29Write index file on any checkout of filesDaniel Barkalow1-15/+15
2008-02-29Fix builtin checkout crashing when given an invalid pathAlex Riesen1-0/+4
2008-02-27Merge branch 'js/branch-track'Junio C Hamano1-9/+5
2008-02-24checkout: error out when index is unmerged even with -mJunio C Hamano1-17/+18
2008-02-23checkout: show progress when checkout takes long time while switching branchesJunio C Hamano1-0/+1
2008-02-21checkout: updates to tracking reportJunio C Hamano1-5/+5
2008-02-21builtin-checkout.c: Remove unused prefix arguments in switch_branches pathDaniel Barkalow1-6/+4
2008-02-20checkout: work from a subdirectoryJunio C Hamano1-1/+0
2008-02-20checkout: tone down the "forked status" diagnostic messagesJunio C Hamano1-40/+64
2008-02-19branch: optionally setup branch.*.merge from upstream local branchesJay Soffian1-9/+5
2008-02-19Clean up reporting differences on branch switchDaniel Barkalow1-71/+7
2008-02-18builtin-checkout.c: fix possible usage segfaultJay Soffian1-0/+1
2008-02-16checkout: notice when the switched branch is behind or forkedJunio C Hamano1-0/+136
2008-02-16Build in checkoutDaniel Barkalow1-0/+477
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-04 15:04:42 +0000