| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/checkout-from-tree-keep-local-changes' | Junio C Hamano | 2011-10-17 | 1 | -1/+5 |
|\ |
|
| * | checkout $tree $path: do not clobber local changes in $path not in $tree | Junio C Hamano | 2011-09-30 | 1 | -1/+5 |
* | | Merge branch 'rs/pending' | Junio C Hamano | 2011-10-13 | 1 | -28/+18 |
|\ \ |
|
| * | | commit: factor out clear_commit_marks_for_object_arrayrs/pending | René Scharfe | 2011-10-03 | 1 | -7/+1 |
| * | | checkout: use leak_pending flag | René Scharfe | 2011-10-03 | 1 | -13/+12 |
| * | | checkout: use add_pending_{object,sha1} in orphan check | René Scharfe | 2011-10-03 | 1 | -27/+12 |
* | | | Merge branch 'mh/check-ref-format-3' | Junio C Hamano | 2011-10-10 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Change check_ref_format() to take a flags argument | Michael Haggerty | 2011-10-05 | 1 | -1/+1 |
* | | | | Merge branch 'jk/argv-array' | Junio C Hamano | 2011-10-05 | 1 | -19/+8 |
|\ \ \ \ |
|
| * | | | | checkout: use argv_array API | Jeff King | 2011-09-14 | 1 | -19/+8 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'ci/forbid-unwanted-current-branch-update' | Junio C Hamano | 2011-09-16 | 1 | -1/+2 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | branch --set-upstream: regression fix | Junio C Hamano | 2011-09-16 | 1 | -1/+2 |
* | | | | Merge branch 'ci/forbid-unwanted-current-branch-update' | Junio C Hamano | 2011-08-28 | 1 | -9/+3 |
|\ \ \ \
| |/ / / |
|
| * | | | Prevent force-updating of the current branch | Conrad Irwin | 2011-08-22 | 1 | -9/+3 |
| * | | | Merge branch 'jc/checkout-reflog-fix' into maint | Junio C Hamano | 2011-08-16 | 1 | -2/+5 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'jc/maint-1.7.3-checkout-describe' into maint | Junio C Hamano | 2011-08-01 | 1 | -1/+1 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'cb/maint-ls-files-error-report' | Junio C Hamano | 2011-08-23 | 1 | -3/+3 |
|\ \ \ \ \ |
|
| * | | | | | ls-files: fix pathspec display on error | Clemens Buchacher | 2011-08-11 | 1 | -3/+3 |
| |/ / / / |
|
* | | | | | Merge branch 'jc/checkout-reflog-fix' | Junio C Hamano | 2011-07-22 | 1 | -2/+5 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | 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 |