This is a re-roll for rr/rebase-checkout-reflog, which is queued in

I've reviewed the changes carefully, and I believe that they are all
correct.  I've added a [6/8], because I think it is the correct way to

Junio: there is no need to re-export GIT_REFLOG_ACTION every time we
set it.  I've also fixed up some of your commit messages.  Let me know
if any further tweaks are necessary.


Junio C Hamano (1):
  t/status-help: test "HEAD detached from"

Ramkumar Ramachandra (7):
  wt-status: remove unused field in grab_1st_switch_cbdata
  t/checkout-last: test "checkout -" after a rebase
  status: do not depend on rebase reflog messages
  checkout: respect GIT_REFLOG_ACTION
  sh-setup: make die_with_status clear GIT_REFLOG_ACTION
  rebase: write better reflog messages
  rebase -i: write better reflog messages

 builtin/checkout.c         | 11 ++++++++---          |  2 ++ |  3 +++              |  8 +++++++-            |  1 +
 t/   | 34 +++++++++++++++++++++++++++++++++
 t/     | 47 +++++++++++++++++++++++++---------------------
 wt-status.c                |  7 ++++---
 8 files changed, 85 insertions(+), 28 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