From: "André Hänsel" <andre@webkr.de>
To: <git@vger.kernel.org>
Subject: git merge --abort deletes unstaged files
Date: Mon, 15 Sep 2014 17:43:33 +0200 [thread overview]
Message-ID: <04af01cfd0fb$d077e200$7167a600$@webkr.de> (raw)
As discussed in
https://groups.google.com/forum/#!topic/git-users/uR7gzLL2Ovc:
I ran git merge to merge a branch. There were some conflicted files.
Although they were automatically resolved by git rerere, I still had to add
them. I accidentally ran "git add ." instead of "git add -u". I noticed my
mistake and ran "git merge --abort" to start over. To my dismay all my
untracked files were gone.
next reply other threads:[~2014-09-15 15:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 15:43 André Hänsel [this message]
2014-09-15 17:16 ` git merge --abort deletes unstaged files Andreas Schwab
2014-09-15 19:25 ` Junio C Hamano
2014-09-15 21:54 ` Andreas Schwab
2014-09-15 22:02 ` Junio C Hamano
2014-09-15 22:28 ` Andreas Schwab
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='04af01cfd0fb$d077e200$7167a600$@webkr.de' \
--to=andre@webkr.de \
--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).