git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: ydirson@free.fr
To: git list <git@vger.kernel.org>
Cc: dirson@bertin.fr, ydirson@free.fr
Subject: [BUG] interactive rebase loses instruction sheet when aborting to avoid overwriting files
Date: Fri, 19 Dec 2014 10:42:55 +0100 (CET)	[thread overview]
Message-ID: <1075489045.367270447.1418982175581.JavaMail.root@zimbra39-e7.priv.proxad.net> (raw)
In-Reply-To: <1009315412.367253372.1418981868176.JavaMail.root@zimbra39-e7.priv.proxad.net>

[using v2.1.3]

When using "rebase -i" and the working dir contains untracked files that are present
in the new base, we correctly get a "would be overwritten by checkout" error, but then
the whole rebase interrupts the (long) listing of the incriminated files in the middle
of a line and terminates with:

Aborting
could not detach HEAD

And consequently we are not rebasing any more, and the precious instruction sheet has been
lost.

           reply	other threads:[~2014-12-19  9:50 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <1009315412.367253372.1418981868176.JavaMail.root@zimbra39-e7.priv.proxad.net>]

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=1075489045.367270447.1418982175581.JavaMail.root@zimbra39-e7.priv.proxad.net \
    --to=ydirson@free.fr \
    --cc=dirson@bertin.fr \
    --cc=git@vger.kernel.org \
    /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).