| commit | 6af984043f121d2f80aeb837c0b2259ad254a829 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jul 2013 20:04:33 +0000 (11 13:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jul 2013 20:04:33 +0000 (11 13:04 -0700) | ||
| tree | 892790852e26db212da6ec26f816795a74de5b97 | treesnapshot (tar.gz zip) |
| parent | 3b8d2765c794ef1f1c7b39a90f72c4e61ce26fbd | commitdiff |
| parent | 3bed291a3b121408b4de83f4fa3cc0f1d98c676e | commitdiff |
Merge branch 'rr/rebase-checkout-reflog'
Invocations of "git checkout" used internally by "git rebase" were
counted as "checkout", and affected later "git checkout -" to the
the user to an unexpected place.
* rr/rebase-checkout-reflog:
checkout: respect GIT_REFLOG_ACTION
status: do not depend on rebase reflog messages
t/t2021-checkout-last: "checkout -" should work after a rebase finishes
wt-status: remove unused field in grab_1st_switch_cbdata
t7512: test "detached from" as well
Invocations of "git checkout" used internally by "git rebase" were
counted as "checkout", and affected later "git checkout -" to the
the user to an unexpected place.
* rr/rebase-checkout-reflog:
checkout: respect GIT_REFLOG_ACTION
status: do not depend on rebase reflog messages
t/t2021-checkout-last: "checkout -" should work after a rebase finishes
wt-status: remove unused field in grab_1st_switch_cbdata
t7512: test "detached from" as well
| builtin/checkout.c | diff1 | diff2 | blobhistory |
| t/t7512-status-help.sh | diff1 | diff2 | blobhistory |
| wt-status.c | diff1 | diff2 | blobhistory |