summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ / |/| / | |/
| * checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland2013-04-211-20/+22
* | Merge branch 'nd/checkout-keep-sparse'Junio C Hamano2013-04-221-0/+5
|\ \ | |/ |/|
| * checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy2013-04-151-0/+5
* | checkout: abbreviate hash in suggest_reattachKevin Bracey2013-04-081-1/+1
|/
* checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-271-7/+36
* checkout: print a message when switching unborn branchesJeff King2012-11-151-0/+3
* Merge branch 'nd/checkout-option-parsing-fix'Junio C Hamano2012-09-141-116/+158
|\
| * checkout: reorder option handlingNguyễn Thái Ngọc Duy2012-09-111-77/+112
| * checkout: move more parameters to struct checkout_optsNguyễn Thái Ngọc Duy2012-08-291-33/+35
| * checkout: pass "struct checkout_opts *" as const pointerNguyễn Thái Ngọc Duy2012-08-291-16/+21
* | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-071-20/+20
|\ \ | |/ |/|
| * i18n: checkout: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-20/+20
* | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-2/+1
|\ \ | |/ |/|
| * diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | Merge branch 'jk/maint-checkout-orphan-check-fix'Junio C Hamano2012-07-271-1/+1
|\ \
| * | checkout: don't confuse ref and object flagsJeff King2012-07-251-1/+1
* | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-111-1/+2