So after extensive discussions with Junio, I have updated [5/6] to
special-case rebase and rebase -i instead of dropping the "HEAD
detached from" message altogether.  Also, [1/6] includes two more
tests, as suggested by Junio.

Junio: The message is now the constant "rebase in progress; onto
$ONTO".  Feel free to tweak it before applying.


Ramkumar Ramachandra (6):
  t/checkout-last: checkout - doesn't work after rebase
  rebase: prepare to write reflog message for checkout
  rebase -i: prepare to write reflog message for checkout
  wt-status: remove unused field in grab_1st_switch_cbdata
  status: do not depend on rebase reflog messages
  checkout: respect GIT_REFLOG_ACTION

 builtin/checkout.c         | 11 ++++++++--- |  2 ++              |  2 ++
 t/   | 34 ++++++++++++++++++++++++++++++++++
 t/     | 37 +++++++++++++++++--------------------
 wt-status.c                |  7 ++++---
 6 files changed, 67 insertions(+), 26 deletions(-)


To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to