summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-281-4/+11
* 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
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano2011-08-011-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-08-231-3/+3
|\ \ \ \ \
| * | | | | ls-files: fix pathspec display on errorClemens Buchacher2011-08-111-3/+3
| |/ / / /
* | | | | Merge branch 'jc/checkout-reflog-fix'Junio C Hamano2011-07-221-2/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge commit 'v1.7.6' into jc/checkout-reflog-fixJunio C Hamano2011-07-061-2/+5
| |/ / /
* | | | Merge branch 'jc/maint-1.7.3-checkout-describe'Junio C Hamano2011-06-291-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-051-1/+1
* | | | Merge branch 'jc/advice-about-to-lose-commit'Junio C Hamano2011-06-291-10/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | checkout: make advice when reattaching the HEAD less loudJunio C Hamano2011-05-241-6/+9
* | | | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-311-5/+2
|\ \ \ \
| * | | | pretty: add pp_commit_easy function for simple callersJeff King2011-05-261-2/+1
| | |_|/ | |/| |
* | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-061-1/+4
|\ \ \ \
| * | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-251-1/+4
| |/ / /
* | | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+15
* | | | i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
* | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-50/+54
|\ \ \ \
| * | | | i18n: git-checkout "Switched to a .. branch" messageÆvar Arnfjörð Bjarmason2011-03-091-6/+8
| * | | | i18n: git-checkout "HEAD is now at" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * | | | i18n: git-checkout describe_detached_head messagesÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * | | | i18n: git-checkout: our/their version messageÆvar Arnfjörð Bjarmason2011-03-091-6/+8
| * | | | i18n: git-checkout basic messagesÆvar Arnfjörð Bjarmason2011-03-091-34/+34
* | | | | checkout: tweak detached-orphan warning formatJeff King2011-03-201-1/+4
* | | | | checkout: clear commit marks after detached-orphan checkJeff King2011-03-201-0/+13
* | | | | Merge branch 'jc/checkout-orphan-warning'Junio C Hamano2011-03-151-6/+95
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | commit: give final warning when reattaching HEAD to leave commits behindJunio C Hamano2011-02-231-6/+95
| | |/ / | |/| |
* | | | Merge branch 'uk/checkout-ambiguous-ref'Junio C Hamano2011-02-271-105/+155
|\ \ \ \ | |_|/ / |/| | |
| * | | checkout: rearrange update_refs_for_switch for clarityJonathan Nieder2011-02-081-14/+13
| * | | checkout: introduce --detach synonym for "git checkout foo^{commit}"Junio C Hamano2011-02-081-5/+20
| * | | checkout: split off a function to peel away branchname argJonathan Nieder2011-02-081-98/+131
| * | | checkout: fix bug with ambiguous refsJunio C Hamano2011-01-111-10/+13
* | | | checkout: add missing const to describe_detached_headJonathan Nieder2011-02-221-1/+1
* | | | correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-141-1/+1
| |/ / |/| |
* | | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-241-2/+2
|\ \ \
| * | | Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-151-1/+1