git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/6] Fix checkout-dash to work with rebase
Date: Sun, 16 Jun 2013 14:15:10 +0530	[thread overview]
Message-ID: <1371372316-16059-1-git-send-email-artagnon@gmail.com> (raw)

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

             reply	other threads:[~2013-06-16  8:47 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-16  8:45 Ramkumar Ramachandra [this message]
2013-06-16  8:45 ` [PATCH v2 1/6] t/checkout-last: checkout - doesn't work after rebase Ramkumar Ramachandra
2013-06-16  8:45 ` [PATCH v2 2/6] rebase: prepare to write reflog message for checkout Ramkumar Ramachandra
2013-06-16  8:45 ` [PATCH v2 3/6] rebase -i: " Ramkumar Ramachandra
2013-06-16  8:45 ` [PATCH v2 4/6] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-16  8:45 ` [PATCH v2 5/6] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-17 17:54   ` Junio C Hamano
2013-06-16  8:45 ` [PATCH v2 6/6] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-17  4:52 ` [PATCH v2 0/6] Fix checkout-dash to work with rebase Junio C Hamano
2013-06-17 17:56   ` Junio C Hamano
2013-06-18  9:30     ` Ramkumar Ramachandra
2013-06-18  9:50       ` Ramkumar Ramachandra
2013-06-18 10:36     ` Ramkumar Ramachandra
2013-06-18 16:15       ` Junio C Hamano
2013-06-18 16:51         ` Ramkumar Ramachandra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371372316-16059-1-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).