From: Johannes Sixt <j6t@kdbg.org>
To: Madhu <enometh@meer.net>
Cc: git@vger.kernel.org
Subject: Re: git-rebase --abort eats files
Date: Sat, 26 Jun 2010 20:09:30 +0200 [thread overview]
Message-ID: <201006262009.30380.j6t@kdbg.org> (raw)
In-Reply-To: <20100626125924.160F11F212@leonis4.robolove.meer.net>
On Samstag, 26. Juni 2010, Madhu wrote:
> Don't know if this has been resolved-by-debate here before, But adding
> a file via git-add in the middle of an interactive rebase and aborting
> the rebase deletes the hitherto untracked file. It should not.
>
> Maybe something like this to fix it?
>
> +++ b/git-rebase--interactive.sh
> @@ -749,6 +749,7 @@ first and then run 'git rebase --continue' again."
> git symbolic-ref HEAD $HEADNAME
> ;;
> esac &&
> + git-reset &&
> output git reset --hard $HEAD &&
> rm -rf "$DOTEST"
> exit
No, it can't be that simple. If rebase stopped due to a conflict on a commit
that added new files, then your version of rebase --abort will leave these
new files behind as untracked.
-- Hannes
next prev parent reply other threads:[~2010-06-26 18:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-26 12:53 git-rebase --abort eats files Madhu
2010-06-26 18:09 ` Johannes Sixt [this message]
2010-06-28 9:05 ` Ramkumar Ramachandra
2010-06-29 1:23 ` Madhu
2010-06-29 6:47 ` Pete Harlan
2013-08-31 15:26 ` git-rebase --continue eats commits Madhu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201006262009.30380.j6t@kdbg.org \
--to=j6t@kdbg.org \
--cc=enometh@meer.net \
--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.
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 NNTP newsgroup(s).