summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-2/+1
|\
| * diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | Merge branch 'jk/maint-checkout-orphan-check-fix' into maintJunio C Hamano2012-08-061-1/+1
|\ \
| * | checkout: don't confuse ref and object flagsJeff King2012-07-251-1/+1
* | | Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2012-07-221-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
|\ \ \ \ \ \ \
| * | | | | | | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-051-1/+3
| * | | | | | | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-131-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'nd/maint-ignore-exclude'Junio C Hamano2011-12-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-excludeNguyễn Thái Ngọc Duy2011-11-281-1/+1
* | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-171-1/+5
|\ \ \ \ \ \
| * | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-301-1/+5
* | | | | | | Merge branch 'rs/pending'Junio C Hamano2011-10-131-28/+18
|\ \ \ \ \ \ \
| * | | | | | | commit: factor out clear_commit_marks_for_object_arrayrs/pendingRené Scharfe2011-10-031-7/+1
| * | | | | | | checkout: use leak_pending flagRené Scharfe2011-10-031-13/+12
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | checkout: use add_pending_{object,sha1} in orphan checkRené Scharfe2011-10-031-27/+12
* | | | | | | Merge branch 'mh/check-ref-format-3'Junio C Hamano2011-10-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-1/+1
* | | | | | | | Merge branch 'jk/argv-array'Junio C Hamano2011-10-051-19/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: use argv_array APIJeff King2011-09-141-19/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-161-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | branch --set-upstream: regression fixJunio C Hamano2011-09-161-1/+2
* | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-281-9/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Prevent force-updating of the current branchConrad Irwin2011-08-221-9/+3
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano2011-08-161-2/+5
| |\ \ \ \ \ \
View Lorry Controller Status