diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:04:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:04:33 -0700 |
| commit | 6af984043f121d2f80aeb837c0b2259ad254a829 (patch) | |
| tree | 892790852e26db212da6ec26f816795a74de5b97 /grep.h | |
| parent | 3b8d2765c794ef1f1c7b39a90f72c4e61ce26fbd (diff) | |
| parent | 3bed291a3b121408b4de83f4fa3cc0f1d98c676e (diff) | |
| download | git-6af984043f121d2f80aeb837c0b2259ad254a829.tar.gz git-6af984043f121d2f80aeb837c0b2259ad254a829.tar.xz | |
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
Diffstat (limited to 'grep.h')
0 files changed, 0 insertions, 0 deletions