From: Andreas Schwab <schwab@linux-m68k.org>
To: "André Hänsel" <andre@webkr.de>
Cc: <git@vger.kernel.org>
Subject: Re: git merge --abort deletes unstaged files
Date: Mon, 15 Sep 2014 19:16:42 +0200 [thread overview]
Message-ID: <87k354x0qt.fsf@igel.home> (raw)
In-Reply-To: <04af01cfd0fb$d077e200$7167a600$@webkr.de> ("André Hänsel"'s message of "Mon, 15 Sep 2014 17:43:33 +0200")
André Hänsel <andre@webkr.de> writes:
> 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.
If you want them to be added automatically, set rerere.autoupdate=true.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2014-09-15 17:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 15:43 git merge --abort deletes unstaged files André Hänsel
2014-09-15 17:16 ` Andreas Schwab [this message]
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=87k354x0qt.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=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).