summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
AgeCommit message (Expand)Author
2008-12-08builtin-checkout.c: check error return from read_cache()Junio C Hamano
2008-11-28Merge branch 'maint'Junio C Hamano
2008-11-28git checkout: don't warn about unborn branch if -f is already passedMatt McCutchen
2008-11-12Merge branch 'maint'Junio C Hamano
2008-11-12checkout: Fix "initial checkout" detectionJunio C Hamano
2008-11-09Merge branch 'maint'Junio C Hamano
2008-11-09checkout: Don't crash when switching away from an invalid branch.Alexandre Julliard
2008-10-19Fix mismerge at cdb22c4 in builtin-checkout.cJunio C Hamano
2008-10-18Merge branch 'db/maint-checkout-b' into maintJunio C Hamano
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-10-06do not segfault if make_cache_entry failedDmitry Potapov
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce
2008-09-25Merge branch 'maint'Shawn O. Pearce
2008-09-25checkout: Do not show local changes when in quiet modeJonas Fonseca
2008-09-22Merge branch 'db/maint-checkout-b'Junio C Hamano
2008-09-22Check early that a new branch is new and validDaniel Barkalow
2008-09-19Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano
2008-09-16Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano
2008-09-10Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano
2008-09-10checkout: do not lose staged removalJunio C Hamano
2008-09-08Merge branch 'jc/maint-checkout-fix'Junio C Hamano
2008-09-03Merge branch 'maint'Junio C Hamano
2008-09-03checkout: fix message when leaving detached HEADJeff King
2008-09-01checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano
2008-08-31merge-recursive: introduce merge_optionsMiklos Vajna
2008-08-31checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano
2008-08-31checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano
2008-08-31checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano
2008-08-30checkout: do not check out unmerged higher stages randomlyJunio C Hamano
2008-08-23Extend "checkout --track" DWIM to support more casesAlex Riesen
2008-08-11checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin
2008-07-25git-checkout: improve error messages, detect ambiguities.Pierre Habouzit
2008-07-24Merge branch 'maint' into ph/checkoutJunio C Hamano
2008-07-23git-checkout: fix command line parsing.Pierre Habouzit
2008-07-15add context pointer to read_tree_recursive()René Scharfe
2008-07-03Refactor "tracking statistics" code used by "git checkout"Junio C Hamano
2008-05-30checkout: "best effort" checkoutJunio C Hamano
2008-05-30checkout: consolidate reset_{to_new,clean_to_new}()Junio C Hamano
2008-05-29checkout: make reset_clean_to_new() not die by itselfJunio C Hamano
2008-05-29"git checkout -- paths..." should error out when paths cannot be writtenJunio C Hamano
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano
2008-05-25Merge branch 'jc/unpack-trees-reword'Junio C Hamano
2008-05-20unpack-trees: allow Porcelain to give different error messagesJunio C Hamano
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin
2008-05-13Extend interface of add_files_to_cache to allow ignore indexing errorsAlex Riesen
2008-05-04Merge branch 'maint'Junio C Hamano
2008-05-04checkout: don't rfc2047-encode oneline on detached HEADJeff King
2008-04-27git checkout: add -t alias for --trackMiklos Vajna
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds