summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-221-0/+18
|\
| * checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-131-0/+18
* | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-3/+3
* | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-141-4/+2
|\ \
| * | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-071-4/+2
* | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-1/+1
|/ /
* | Merge branch 'dt/cache-tree-repair'Junio C Hamano2014-09-111-0/+6
|\ \
| * | cache-tree: create/update cache-tree on checkoutDavid Turner2014-07-071-0/+8
* | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-7/+5
|\ \ \
| * | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-131-0/+1
| * | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-7/+4
| |/ /
* | | use skip_prefix to avoid repeating stringsJeff King2014-06-201-2/+2
* | | Merge branch 'rs/reflog-exists'Junio C Hamano2014-06-061-6/+2
|\ \ \
| * | | checkout.c: use ref_exists instead of file_existrs/reflog-existsRonnie Sahlberg2014-05-081-4/+1
| * | | refs.c: add new functions reflog_exists and delete_reflogRonnie Sahlberg2014-05-081-4/+3
| |/ /
* | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-031-1/+1
|\ \ \ | |/ / |/| |
| * | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-1/+1
* | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-1/+1
|\ \ \
| * | | comments: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
* | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-081-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-241-1/+1
| |/ /
* | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-281-4/+4
|\ \ \ | |/ / |/| |
| * | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-4/+4
* | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-241-2/+1
|/ /
* | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-4/+4
|\ \
| * | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-4/+4
| |/
* | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-051-6/+6
|\ \ | |/ |/|
| * checkout: do not die when leaving broken detached HEADjk/robustify-parse-commitJeff King2013-10-241-4/+4
| * use parse_commit_or_die instead of segfaultingJeff King2013-10-241-2/+2
* | Merge branch 'mm/checkout-auto-track-fix'Junio C Hamano2013-10-301-28/+71
|\ \
| * | checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fixMatthieu Moy2013-10-181-5/+16
| * | checkout: allow dwim for branch creation for "git checkout $branch --"Matthieu Moy2013-10-181-23/+55
| * | Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-271-20/+22
| |\ \
* | \ \ Merge branch 'nd/magic-pathspec'Junio C Hamano2013-09-091-7/+0
|\ \ \ \
| * | | | add: lift the pathspec magic restriction on "add -p"Nguyễn Thái Ngọc Duy2013-09-051-7/+0
* | | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-18/+22
|\ \ \ \ \ | |/ / / /
| * | | | convert report_path_error to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
| * | | | checkout: convert read_tree_some to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-6/+3
| * | | | convert run_add_interactive to use struct pathspecNguyễn Thái Ngọc Duy2013-07-151-5/+4
| * | | | convert read_cache_preload() to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
| * | | | checkout: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-13/+21
* | | | | checkout: remove superfluous local variableStefan Beller2013-08-051-7/+5
* | | | | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-5/+5
* | | | | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-051-3/+2
| |_|_|/ |/| | |
* | | | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-4/+4
* | | | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-111-3/+8
|\ \ \ \ | |/ / / |/| | |
| * | | checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra2013-06-171-3/+8
| |/ /
* | | builtin/checkout.c: don't leak memory in check_tracking_nameBrandon Casey2013-06-181-2/+5
* | | Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-05-291-20/+22
|\ \ \ | |/ / |/| / | |/
View Lorry Controller Status