summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'cw/no-detaching-an-unborn'Junio C Hamano2012-07-091-0/+2
|\ \ \
| * | | git-checkout: disallow --detach on unborn branchChris Webb2012-06-261-0/+2
* | | | Merge branch 'ap/checkout-no-progress-for-non-tty'Junio C Hamano2012-05-251-2/+2
|\ \ \ \
| * | | | checkout: no progress messages if !isatty(2).Avery Pennarun2012-05-241-2/+2
| * | | | Merge branch 'ef/checkout-empty' into maintJunio C Hamano2012-05-141-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'ef/checkout-empty'Junio C Hamano2012-05-111-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | checkout: do not corrupt HEAD on empty repoErik Faye-Lund2012-05-081-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'js/checkout-detach-count'Junio C Hamano2012-05-101-6/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | checkout (detached): truncate list of orphaned commits at the new HEADJohannes Sixt2012-05-041-6/+7
* | | | | Merge branch 'jk/branch-quiet'Junio C Hamano2012-04-161-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | checkout: suppress tracking message with "-q"Jeff King2012-03-261-0/+1
| | |_|/ | |/| |
| * | | Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-161-0/+19
| |\ \ \ | | |/ /
* | | | Merge branch 'jc/checkout-out-of-unborn'Junio C Hamano2012-02-121-0/+19
|\ \ \ \ | | |/ / | |/| |
| * | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-061-0/+19
| * | | Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-231-3/+3
| |\ \ \
* | | | | clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-161-15/+1
| |_|/ / |/| | |
* | | | Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-191-24/+36
|\ \ \ \
| * | | | checkout_merged(): squelch false warning from some gccJunio C Hamano2011-12-151-1/+1
| * | | | checkout -m: no need to insist on having all 3 stagesJunio C Hamano2011-12-061-24/+36
* | | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-191-8/+7
|\ \ \ \ \
| * | | | | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-131-8/+7
* | | | | | Merge branch 'nd/ignore-might-be-precious'Junio C Hamano2011-12-131-3/+8
|\ \ \ \ \ \
| * | | | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-preciousNguyễn Thái Ngọc Duy2011-11-281-3/+8
| * | | | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano2011-11-281-1/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-131-4/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-281-4/+11
| |/ / / / / /
* | | | | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-091-3/+5
|\ \ \ \ \ \ \