summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | add OPT__FORCERené Scharfe2010-11-151-1/+1
| * | | add description parameter to OPT__QUIETRené Scharfe2010-11-151-1/+1
* | | | Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-031-1/+1
* | | | Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-031-1/+1
|/ / /
* | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-1/+1
|\ \ \ | |/ / |/| |
| * | ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-1/+1
* | | Improvements to `git checkout -h`Daniel Knittl-Frank2010-09-271-6/+6
* | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-09-041-4/+17
|\ \ \
| * | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann2010-08-301-0/+5
| * | | checkout: respect diff.ignoreSubmodules settingJohannes Schindelin2010-08-251-4/+12
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-2/+1
|\ \ \ \
| * | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-031-1/+0
| * | | | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+1
| * | | | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-1/+1
* | | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge-recursive --renormalizeJonathan Nieder2010-08-061-0/+7
| * | | | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-061-0/+4
| | |/ / | |/| |
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-211-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-0/+1
| * | | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-111-1/+1
| * | | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-111-1/+1
| |/ /
View Lorry Controller Status