From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2013 20:04:33 +0000 (-0700)
Subject: Merge branch 'rr/rebase-checkout-reflog'
X-Git-Tag: v1.8.4-rc0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6af984043f121d2f80aeb837c0b2259ad254a829;p=thirdparty%2Fgit.git

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
---

6af984043f121d2f80aeb837c0b2259ad254a829