[PATCH v2 0/6] Fix checkout-dash to work with rebase
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jun 16, 2013, 08:45 UTC
- Message-ID
- <1371372316-16059-1-git-send-email-artagnon@gmail.com>
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.
Thanks.
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 ++++++++--- git-rebase--interactive.sh | 2 ++ git-rebase.sh | 2 ++ t/t2012-checkout-last.sh | 34 ++++++++++++++++++++++++++++++++++ t/t7512-status-help.sh | 37 +++++++++++++++++-------------------- wt-status.c | 7 ++++--- 6 files changed, 67 insertions(+), 26 deletions(-)
-- 1.8.3.1.443.g4fd77b9