summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
AgeCommit message (Expand)AuthorFilesLines
2008-10-06do not segfault if make_cache_entry failedLibravatar Dmitry Potapov1-0/+2
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-21/+173
2008-09-25Merge branch 'mv/merge-recursive'Libravatar Shawn O. Pearce1-3/+8
2008-09-25Merge branch 'maint'Libravatar Shawn O. Pearce1-1/+1
2008-09-25checkout: Do not show local changes when in quiet modeLibravatar Jonas Fonseca1-1/+1
2008-09-21Merge branch 'db/maint-checkout-b'Libravatar Junio C Hamano1-0/+12
2008-09-21Check early that a new branch is new and validLibravatar Daniel Barkalow1-0/+12
2008-09-18Merge branch 'jc/maint-checkout-keep-remove' into maintLibravatar Junio C Hamano1-0/+2
2008-09-16Merge branch 'jc/maint-checkout-keep-remove'Libravatar Junio C Hamano1-0/+2
2008-09-10Merge branch 'jc/maint-checkout-fix' into maintLibravatar Junio C Hamano1-1/+28
2008-09-09checkout: do not lose staged removalLibravatar Junio C Hamano1-0/+2
2008-09-07Merge branch 'jc/maint-checkout-fix'Libravatar Junio C Hamano1-1/+28
2008-09-03Merge branch 'maint'Libravatar Junio C Hamano1-6/+4
2008-09-03checkout: fix message when leaving detached HEADLibravatar Jeff King1-6/+4
2008-08-31checkout --conflict=<style>: recreate merge in a non-default styleLibravatar Junio C Hamano1-1/+9
2008-08-30merge-recursive: introduce merge_optionsLibravatar Miklos Vajna1-3/+8
2008-08-30checkout -m: recreate merge when checking out of unmerged indexLibravatar Junio C Hamano1-2/+102
2008-08-30checkout --ours/--theirs: allow checking out one side of a conflicting mergeLibravatar Junio C Hamano1-1/+38
2008-08-30checkout -f: allow ignoring unmerged paths when checking out of the indexLibravatar Junio C Hamano1-18/+23
2008-08-30checkout: do not check out unmerged higher stages randomlyLibravatar Junio C Hamano1-1/+28
2008-08-22Extend "checkout --track" DWIM to support more casesLibravatar Alex Riesen1-13/+13
2008-08-11checkout --track: make up a sensible branch name if '-b' was omittedLibravatar Johannes Schindelin1-3/+18
2008-07-24git-checkout: improve error messages, detect ambiguities.Libravatar Pierre Habouzit1-17/+65
2008-07-23Merge branch 'maint' into ph/checkoutLibravatar Junio C Hamano1-1/+2
2008-07-23git-checkout: fix command line parsing.Libravatar Pierre Habouzit1-1/+2
2008-07-15add context pointer to read_tree_recursive()Libravatar René Scharfe1-2/+2
2008-07-02Refactor "tracking statistics" code used by "git checkout"Libravatar Junio C Hamano1-88/+6
2008-05-29checkout: "best effort" checkoutLibravatar Junio C Hamano1-4/+18
2008-05-29checkout: consolidate reset_{to_new,clean_to_new}()Libravatar Junio C Hamano1-35/+15
2008-05-28checkout: make reset_clean_to_new() not die by itselfLibravatar Junio C Hamano1-3/+6
2008-05-28"git checkout -- paths..." should error out when paths cannot be writtenLibravatar Junio C Hamano1-2/+5
2008-05-25Merge branch 'js/config-cb'Libravatar Junio C Hamano1-1/+1
2008-05-25Merge branch 'jc/unpack-trees-reword'Libravatar Junio C Hamano1-0/+2
2008-05-19unpack-trees: allow Porcelain to give different error messagesLibravatar Junio C Hamano1-0/+2
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-1/+1
2008-05-12Extend interface of add_files_to_cache to allow ignore indexing errorsLibravatar Alex Riesen1-1/+1
2008-05-03Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-05-03checkout: don't rfc2047-encode oneline on detached HEADLibravatar Jeff King1-1/+1
2008-04-27git checkout: add -t alias for --trackLibravatar Miklos Vajna1-1/+1
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds1-3/+6
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds1-0/+6
2008-03-02cleanup: remove unused git_checkout_configLibravatar Denis Cheng1-6/+1
2008-02-29Write index file on any checkout of filesLibravatar Daniel Barkalow1-15/+15
2008-02-29Fix builtin checkout crashing when given an invalid pathLibravatar Alex Riesen1-0/+4
2008-02-27Merge branch 'js/branch-track'Libravatar Junio C Hamano1-9/+5
2008-02-24checkout: error out when index is unmerged even with -mLibravatar Junio C Hamano1-17/+18
2008-02-23checkout: show progress when checkout takes long time while switching branchesLibravatar Junio C Hamano1-0/+1
2008-02-21checkout: updates to tracking reportLibravatar Junio C Hamano1-5/+5
2008-02-21builtin-checkout.c: Remove unused prefix arguments in switch_branches pathLibravatar Daniel Barkalow1-6/+4
2008-02-20checkout: work from a subdirectoryLibravatar Junio C Hamano1-1/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:20:34 +0000