summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
2011-10-21Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintLibravatar Junio C Hamano1-1/+5
2011-09-30checkout $tree $path: do not clobber local changes in $path not in $treeLibravatar Junio C Hamano1-1/+5
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano1-1/+2
2011-09-16branch --set-upstream: regression fixLibravatar Junio C Hamano1-1/+2
2011-08-28Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano1-9/+3
2011-08-23Merge branch 'cb/maint-ls-files-error-report'Libravatar Junio C Hamano1-3/+3
2011-08-22Prevent force-updating of the current branchLibravatar Conrad Irwin1-9/+3
2011-08-16Merge branch 'jc/checkout-reflog-fix' into maintLibravatar Junio C Hamano1-2/+5
2011-08-11ls-files: fix pathspec display on errorLibravatar Clemens Buchacher1-3/+3
2011-08-01Merge branch 'jc/maint-1.7.3-checkout-describe' into maintLibravatar Junio C Hamano1-1/+1
2011-07-22Merge branch 'jc/checkout-reflog-fix'Libravatar Junio C Hamano1-2/+5
2011-07-06Merge commit 'v1.7.6' into jc/checkout-reflog-fixLibravatar Junio C Hamano1-0/+1093
2011-06-29Merge branch 'jc/maint-1.7.3-checkout-describe'Libravatar Junio C Hamano1-1/+1
2011-06-29Merge branch 'jc/advice-about-to-lose-commit'Libravatar Junio C Hamano1-10/+11
2011-06-05checkout -b <name>: correctly detect existing branchLibravatar Junio C Hamano1-1/+1
2011-05-31Merge branch 'jk/format-patch-am'Libravatar Junio C Hamano1-5/+2
2011-05-26pretty: add pp_commit_easy function for simple callersLibravatar Jeff King1-2/+1
2011-05-24checkout: make advice when reattaching the HEAD less loudLibravatar Junio C Hamano1-6/+9
2011-05-06Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-1/+4
2011-04-12i18n: mark checkout plural warning for translationLibravatar Ævar Arnfjörð Bjarmason1-3/+15
2011-04-12i18n: mark checkout --detach messages for translationLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-50/+54
2011-03-25Convert read_tree{,_recursive} to support struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-1/+4
2011-03-20checkout: tweak detached-orphan warning formatLibravatar Jeff King1-1/+4
2011-03-20checkout: clear commit marks after detached-orphan checkLibravatar Jeff King1-0/+13
2011-03-15Merge branch 'jc/checkout-orphan-warning'Libravatar Junio C Hamano1-6/+95
2011-03-09i18n: git-checkout "Switched to a .. branch" messageLibravatar Ævar Arnfjörð Bjarmason1-6/+8
2011-03-09i18n: git-checkout "HEAD is now at" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-checkout describe_detached_head messagesLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-checkout: our/their version messageLibravatar Ævar Arnfjörð Bjarmason1-6/+8
2011-03-09i18n: git-checkout basic messagesLibravatar Ævar Arnfjörð Bjarmason1-34/+34
2011-02-27Merge branch 'uk/checkout-ambiguous-ref'Libravatar Junio C Hamano1-105/+155
2011-02-23commit: give final warning when reattaching HEAD to leave commits behindLibravatar Junio C Hamano1-6/+95
2011-02-22checkout: add missing const to describe_detached_headLibravatar Jonathan Nieder1-1/+1
2011-02-14correct type of EMPTY_TREE_SHA1_BINLibravatar Jonathan Nieder1-1/+1
2011-02-08checkout: rearrange update_refs_for_switch for clarityLibravatar Jonathan Nieder1-14/+13
2011-02-08checkout: introduce --detach synonym for "git checkout foo^{commit}"Libravatar Junio C Hamano1-5/+20
2011-02-08checkout: split off a function to peel away branchname argLibravatar Jonathan Nieder1-98/+131
2011-01-11checkout: fix bug with ambiguous refsLibravatar Junio C Hamano1-10/+13
2010-11-24Merge branch 'rs/opt-help-text'Libravatar Junio C Hamano1-2/+2
2010-11-15Describe various forms of "be quiet" using OPT__QUIETLibravatar Jonathan Nieder1-1/+1
2010-11-15add OPT__FORCELibravatar René Scharfe1-1/+1
2010-11-15add description parameter to OPT__QUIETLibravatar René Scharfe1-1/+1
2010-11-03Change "tracking branch" to "remote-tracking branch"Libravatar Matthieu Moy1-1/+1
2010-11-03Replace "remote tracking" with "remote-tracking"Libravatar Matthieu Moy1-1/+1
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-1/+1
2010-09-27Improvements to `git checkout -h`Libravatar Daniel Knittl-Frank1-6/+6
2010-09-04Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano1-4/+17
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-2/+1
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+11