Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge commit 'v1.7.6' into jc/checkout-reflog-fix | Junio C Hamano | 2011-07-06 | 1 | -2/+5 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe' | Junio C Hamano | 2011-06-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | checkout -b <name>: correctly detect existing branch | Junio C Hamano | 2011-06-05 | 1 | -1/+1 | |
* | | | | | | Merge branch 'jc/advice-about-to-lose-commit' | Junio C Hamano | 2011-06-29 | 1 | -10/+11 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | checkout: make advice when reattaching the HEAD less loud | Junio C Hamano | 2011-05-24 | 1 | -6/+9 | |
* | | | | | | Merge branch 'jk/format-patch-am' | Junio C Hamano | 2011-05-31 | 1 | -5/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | pretty: add pp_commit_easy function for simple callers | Jeff King | 2011-05-26 | 1 | -2/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 | 1 | -1/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 | 1 | -1/+4 | |
| |/ / / / / | ||||||
* | | | | | | i18n: mark checkout plural warning for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+15 | |
* | | | | | | i18n: mark checkout --detach messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+3 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 | 1 | -50/+54 | |
|\ \ \ \ \ | ||||||
| * | | | | | i18n: git-checkout "Switched to a .. branch" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -6/+8 | |
| * | | | | | i18n: git-checkout "HEAD is now at" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 | |
| * | | | | | i18n: git-checkout describe_detached_head messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 | |
| * | | | | | i18n: git-checkout: our/their version message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -6/+8 | |
| * | | | | | i18n: git-checkout basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -34/+34 | |
* | | | | | | checkout: tweak detached-orphan warning format | Jeff King | 2011-03-20 | 1 | -1/+4 | |
* | | | | | | checkout: clear commit marks after detached-orphan check | Jeff King | 2011-03-20 | 1 | -0/+13 | |
* | | | | | | Merge branch 'jc/checkout-orphan-warning' | Junio C Hamano | 2011-03-15 | 1 | -6/+95 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | commit: give final warning when reattaching HEAD to leave commits behind | Junio C Hamano | 2011-02-23 | 1 | -6/+95 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'uk/checkout-ambiguous-ref' | Junio C Hamano | 2011-02-27 | 1 | -105/+155 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | checkout: rearrange update_refs_for_switch for clarity | Jonathan Nieder | 2011-02-08 | 1 | -14/+13 | |
| * | | | | checkout: introduce --detach synonym for "git checkout foo^{commit}" | Junio C Hamano | 2011-02-08 | 1 | -5/+20 | |
| * | | | | checkout: split off a function to peel away branchname arg | Jonathan Nieder | 2011-02-08 | 1 | -98/+131 | |
| * | | | | checkout: fix bug with ambiguous refs | Junio C Hamano | 2011-01-11 | 1 | -10/+13 | |
* | | | | | checkout: add missing const to describe_detached_head | Jonathan Nieder | 2011-02-22 | 1 | -1/+1 | |
* | | | | | correct type of EMPTY_TREE_SHA1_BIN | Jonathan Nieder | 2011-02-14 | 1 | -1/+1 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'rs/opt-help-text' | Junio C Hamano | 2010-11-24 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Describe various forms of "be quiet" using OPT__QUIET | Jonathan Nieder | 2010-11-15 | 1 | -1/+1 | |
| * | | | | add OPT__FORCE | René Scharfe | 2010-11-15 | 1 | -1/+1 | |
| * | | | | add description parameter to OPT__QUIET | René Scharfe | 2010-11-15 | 1 | -1/+1 | |
* | | | | | Change "tracking branch" to "remote-tracking branch" | Matthieu Moy | 2010-11-03 | 1 | -1/+1 | |
* | | | | | Replace "remote tracking" with "remote-tracking" | Matthieu Moy | 2010-11-03 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 1 | -1/+1 | |
* | | | | Improvements to `git checkout -h` | Daniel Knittl-Frank | 2010-09-27 | 1 | -6/+6 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-09-04 | 1 | -4/+17 | |
|\ \ \ | ||||||
| * | | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodules | Jens Lehmann | 2010-08-30 | 1 | -0/+5 | |
| * | | | checkout: respect diff.ignoreSubmodules setting | Johannes Schindelin | 2010-08-25 | 1 | -4/+12 | |
* | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 1 | -2/+1 | |
|\ \ \ \ | ||||||
| * | | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 2010-09-03 | 1 | -1/+0 | |
| * | | | | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 | 1 | -1/+1 | |
| * | | | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 1 | -1/+1 | |
* | | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -0/+11 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+7 | |
| * | | | | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+4 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 1 | -1/+2 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 1 | -0/+1 | |
| * | | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 1 | -1/+1 |