aboutsummaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAge
* Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-13
|\
| * checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy2011-11-28
* | Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-26
|\ \
| * | checkout: use argv_array APIJeff King2011-09-14
* | | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-21
|\ \ \
| * | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-30
* | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-16
|\ \ \ \
| * | | | branch --set-upstream: regression fixJunio C Hamano2011-09-16
* | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-28
|\ \ \ \ \ | |/ / / /
| * | | | Prevent force-updating of the current branchConrad Irwin2011-08-22
| * | | | Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano2011-08-16
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano2011-08-01
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-08-23
|\ \ \ \ \ \
| * | | | | | ls-files: fix pathspec display on errorClemens Buchacher2011-08-11
| |/ / / / /
* | | | | | 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
|\ \ \ \ | |/ / / |/| | |