summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
Commit message (Expand)AuthorAgeFilesLines
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-251-0/+4
* resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-251-0/+2
* fixup tr/stash-format mergeJunio C Hamano2009-10-301-1/+2
|\
| * Refactor pretty_print_commit arguments into a structThomas Rast2009-10-191-1/+2
* | git checkout --no-guessJunio C Hamano2009-10-211-0/+5
* | DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"Junio C Hamano2009-10-181-3/+57
|/
* Merge branch 'tr/reset-checkout-patch'Junio C Hamano2009-09-071-0/+19
|\
| * Implement 'git checkout --patch'Thomas Rast2009-08-151-0/+19
* | UI consistency: allow --force for where -f means forceRené Scharfe2009-08-291-1/+1
* | Merge branch 'jk/maint-1.6.3-checkout-unborn'Junio C Hamano2009-08-281-9/+3
|\ \ | |/ |/|
| * checkout: do not imply "-f" on unborn branchesJeff King2009-08-251-9/+3
| * Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano2009-05-251-2/+2
| |\
* | | parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-1/+1
* | | Merge branch 'lt/maint-diff-reduce-lstat'Junio C Hamano2009-05-231-2/+2
|\ \ \ | |/ / |/| / | |/
| * Teach 'git checkout' to preload the index contentsLinus Torvalds2009-05-091-2/+2
* | builtin-checkout: Don't tell user that HEAD has moved before it hasDaniel Cordero2009-05-161-8/+8
* | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-05-121-8/+1
|\ \
| * | Revert "checkout branch: prime cache-tree fully"Junio C Hamano2009-05-121-8/+1
* | | 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
|\ \ | |/
View Lorry Controller Status