aboutsummaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/checkout-reflog-fix'Junio C Hamano2011-07-22
|\
| * Merge commit 'v1.7.6' into jc/checkout-reflog-fixJunio C Hamano2011-07-06
* | Merge branch 'jc/maint-1.7.3-checkout-describe'Junio C Hamano2011-06-29
|\ \
| * | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-05
* | | Merge branch 'jc/advice-about-to-lose-commit'Junio C Hamano2011-06-29
|\ \ \ | |_|/ |/| |
| * | checkout: make advice when reattaching the HEAD less loudJunio C Hamano2011-05-24
* | | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-31
|\ \ \
| * | | pretty: add pp_commit_easy function for simple callersJeff King2011-05-26
* | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-06
|\ \ \ \
| * | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-25
| |/ / /
* | | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-12
* | | | i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-12
* | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-01
|\ \ \ \
| * | | | i18n: git-checkout "Switched to a .. branch" messageÆvar Arnfjörð Bjarmason2011-03-09
| * | | | i18n: git-checkout "HEAD is now at" messageÆvar Arnfjörð Bjarmason2011-03-09
| * | | | i18n: git-checkout describe_detached_head messagesÆvar Arnfjörð Bjarmason2011-03-09
| * | | | i18n: git-checkout: our/their version messageÆvar Arnfjörð Bjarmason2011-03-09
| * | | | i18n: git-checkout basic messagesÆvar Arnfjörð Bjarmason2011-03-09
* | | | | checkout: tweak detached-orphan warning formatJeff King2011-03-20
* | | | | checkout: clear commit marks after detached-orphan checkJeff King2011-03-20
* | | | | Merge branch 'jc/checkout-orphan-warning'Junio C Hamano2011-03-15
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | commit: give final warning when reattaching HEAD to leave commits behindJunio C Hamano2011-02-23
| | |/ / | |/| |
* | | | Merge branch 'uk/checkout-ambiguous-ref'Junio C Hamano2011-02-27
|\ \ \ \ | |_|/ / |/| | |
| * | | checkout: rearrange update_refs_for_switch for clarityJonathan Nieder2011-02-08
| * | | checkout: introduce --detach synonym for "git checkout foo^{commit}"Junio C Hamano2011-02-08
| * | | checkout: split off a function to peel away branchname argJonathan Nieder2011-02-08
| * | | checkout: fix bug with ambiguous refsJunio C Hamano2011-01-11
* | | | checkout: add missing const to describe_detached_headJonathan Nieder2011-02-22
* | | | correct type of EMPTY_TREE_SHA1_BINJonathan Nieder2011-02-14
| |/ / |/| |
* | | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-24
|\ \ \
| * | | Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-15
| * | | add OPT__FORCERené Scharfe2010-11-15
| * | | add description parameter to OPT__QUIETRené Scharfe2010-11-15
* | | | Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-03
* | | | Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-03
|/ / /
* | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-26
|\ \ \ | |/ / |/| |
| * | ll-merge: replace flag argument with options structJonathan Nieder2010-08-26
* | | Improvements to `git checkout -h`Daniel Knittl-Frank2010-09-27
* | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-09-04
|\ \ \
| * | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann2010-08-30
| * | | checkout: respect diff.ignoreSubmodules settingJohannes Schindelin2010-08-25
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-03
|\ \ \ \
| * | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-03
| * | | | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-03
| * | | | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03
* | | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge-recursive --renormalizeJonathan Nieder2010-08-06
| * | | | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-06
| | |/ / | |/| |
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-21
|\ \ \ \ | | |/ / | |/| |
| * | | unpack_trees: group error messages by typeMatthieu Moy2010-08-11