summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
Commit message (Expand)AuthorAgeFilesLines
* builtin-checkout.c: check error return from read_cache()Junio C Hamano2008-12-071-2/+5
* Merge branch 'maint'Junio C Hamano2008-11-271-1/+1
|\
| * git checkout: don't warn about unborn branch if -f is already passedMatt McCutchen2008-11-271-1/+1
* | Merge branch 'maint'Junio C Hamano2008-11-121-2/+1
|\ \ | |/
| * checkout: Fix "initial checkout" detectionJunio C Hamano2008-11-121-2/+1
* | Merge branch 'maint'Junio C Hamano2008-11-091-4/+4
|\ \ | |/
| * checkout: Don't crash when switching away from an invalid branch.Alexandre Julliard2008-11-091-4/+4
| * Merge branch 'db/maint-checkout-b' into maintJunio C Hamano2008-10-181-0/+12
| |\
* | | Fix mismerge at cdb22c4 in builtin-checkout.cJunio C Hamano2008-10-191-3/+0
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-8/+4
* | | do not segfault if make_cache_entry failedDmitry Potapov2008-10-061-0/+2
* | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-21/+173
|\ \ \
| * | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-311-1/+9
| * | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-301-2/+102
| * | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-301-1/+38
| * | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-301-18/+23
* | | | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-251-3/+8
|\ \ \ \
| * | | | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-301-3/+8
* | | | | Merge branch 'maint'Shawn O. Pearce2008-09-251-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | checkout: Do not show local changes when in quiet modeJonas Fonseca2008-09-251-1/+1
* | | | | Merge branch 'db/maint-checkout-b'Junio C Hamano2008-09-211-0/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Check early that a new branch is new and validDaniel Barkalow2008-09-211-0/+12
| |/ / /
| * | | Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-181-0/+2
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano2008-09-101-1/+28
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano2008-09-161-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | checkout: do not lose staged removalJunio C Hamano2008-09-091-0/+2
| |/ / /
* | | | Merge branch 'jc/maint-checkout-fix'Junio C Hamano2008-09-071-1/+28
|\ \ \ \ | | |/ / | |/| |
| * | | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-301-1/+28
* | | | Merge branch 'maint'Junio C Hamano2008-09-031-6/+4
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | checkout: fix message when leaving detached HEADJeff King2008-09-031-6/+4
| |/
* | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-221-13/+13
* | checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin2008-08-111-3/+18
|/
* git-checkout: improve error messages, detect ambiguities.Pierre Habouzit2008-07-241-17/+65
* Merge branch 'maint' into ph/checkoutJunio C Hamano2008-07-231-1/+2
|\
| * git-checkout: fix command line parsing.Pierre Habouzit2008-07-231-1/+2
* | add context pointer to read_tree_recursive()René Scharfe2008-07-151-2/+2
* | Refactor "tracking statistics" code used by "git checkout"Junio C Hamano2008-07-021-88/+6
|/
* checkout: "best effort" checkoutJunio C Hamano2008-05-291-4/+18
* checkout: consolidate reset_{to_new,clean_to_new}()Junio C Hamano2008-05-291-35/+15
* checkout: make reset_clean_to_new() not die by itselfJunio C Hamano2008-05-281-3/+6
* "git checkout -- paths..." should error out when paths cannot be writtenJunio C Hamano2008-05-281-2/+5
* Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-251-1/+1
|\
| * Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-1/+1
* | Merge branch 'jc/unpack-trees-reword'Junio C Hamano2008-05-251-0/+2
|\ \
| * | unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-191-0/+2
| |/
* | Extend interface of add_files_to_cache to allow ignore indexing errorsAlex Riesen2008-05-121-1/+1
|/
* Merge branch 'maint'Junio C Hamano2008-05-031-1/+1
|\
| * checkout: don't rfc2047-encode oneline on detached HEADJeff King2008-05-031-1/+1
* | git checkout: add -t alias for --trackMiklos Vajna2008-04-271-1/+1
|/
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-3/+6
View Lorry Controller Status