summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-read-tree-multi'Junio C Hamano2009-04-221-1/+9
|\
| * checkout branch: prime cache-tree fullyJunio C Hamano2009-04-201-1/+8
| * Move prime_cache_tree() to cache-tree.cJunio C Hamano2009-04-201-0/+1
| * Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano2009-04-181-3/+0
| |\
* | | Fix typos / spelling in commentsMike Ralphson2009-04-221-1/+1
* | | Merge branch 'maint'Junio C Hamano2009-04-071-3/+3
|\ \ \ | |/ /
| * | Change double quotes to single quotes in messageJari Aalto2009-04-071-3/+3
* | | Merge branch 'js/maint-submodule-checkout'Junio C Hamano2009-04-071-3/+0
|\ \ \ | | |/ | |/|
| * | Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2009-04-021-3/+0
| |/
* | Merge branch 'jc/name-branch'Junio C Hamano2009-04-061-12/+6
|\ \
| * | strbuf_check_branch_ref(): a helper to check a refname for a branchJunio C Hamano2009-03-221-4/+3
| * | strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-221-8/+3
| * | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-221-1/+1
* | | builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")Miklos Vajna2009-03-231-2/+2
|/ /
* | Merge branch 'mv/parseopt-ls-files'Junio C Hamano2009-03-201-1/+1
|\ \
| * | Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-181-1/+1
| |/
* | Fix neglect of diff_setup()/diff_setup_done() symmetry.Keith Cascio2009-03-041-0/+2
|/
* Merge branch 'tr/previous-branch'Junio C Hamano2009-01-281-2/+13
|\
| * checkout: implement "-" abbreviation, add docs and testsThomas Rast2009-01-171-0/+3
| * sha1_name: tweak @{-N} lookupThomas Rast2009-01-171-1/+3
| * checkout: implement "@{-N}" shortcut name for N-th last branchJunio C Hamano2009-01-171-2/+8
* | Merge branch 'cb/add-pathspec'Junio C Hamano2009-01-251-3/+3
|\ \
| * | remove pathspec_match, use match_pathspec insteadClemens Buchacher2009-01-141-3/+3
| * | Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano2009-01-111-1/+1
| |\ \
* | | | Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer2009-01-171-17/+5
* | | | checkout: don't crash on file checkout before running post-checkout hookStephan Beyer2009-01-171-2/+4
| |_|/ |/| |
* | | Merge branch 'jc/maint-do-not-switch-to-non-commit'Junio C Hamano2009-01-031-1/+1
|\ \ \ | |/ / |/| / | |/
| * git checkout: do not allow switching to a tree-ish that is not a commitJunio C Hamano2009-01-031-1/+1
* | 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
| |/ / /
View Lorry Controller Status