From: Ingo Lohmar <i.lohmar@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Alan Mackenzie <acm@muc.de>,
Kaushal Modi <kaushal.modi@gmail.com>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2]
Date: Sun, 03 Apr 2016 16:57:54 +0200 [thread overview]
Message-ID: <878u0ueo3x.fsf@acer.localhost.com> (raw)
In-Reply-To: <87mvpazsqo.fsf@linux-m68k.org>
On Sun, Apr 03 2016 16:12 (+0200), Andreas Schwab wrote:
> Ingo Lohmar <i.lohmar@gmail.com> writes:
>
>> Single caveat: Do NOT start a merge when you have uncommited changes.
>
> git merge will not allow overwriting uncommited changes anyway.
>
> Andreas.
That's correct, but if the changes are in files unaffected by the merge,
git *does* start the merge. But it will be hard to return to the exact
pre-merge state if you want to abort.
At least that's what everybody and the man page tell me, I can't
remember whether I tested it myself at some point.
next prev parent reply other threads:[~2016-04-03 14:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-01 5:32 Understanding a recent commit in emacs-25 branch [ed19f2] Kaushal Modi
2016-04-01 5:43 ` Kaushal Modi
2016-04-01 6:43 ` Paul Eggert
2016-04-03 12:03 ` Alan Mackenzie
2016-04-03 12:10 ` Achim Gratz
2016-04-03 14:18 ` Stefan Monnier
2016-04-03 14:49 ` Óscar Fuentes
2016-04-03 18:15 ` Achim Gratz
2016-04-03 18:45 ` Andreas Schwab
2016-04-03 18:56 ` Eli Zaretskii
2016-04-03 20:02 ` Paul Eggert
2016-04-03 21:15 ` Andreas Schwab
2016-04-03 23:11 ` John Wiegley
2016-04-03 12:18 ` Ingo Lohmar
2016-04-03 11:17 ` Alan Mackenzie
2016-04-03 11:27 ` Andreas Schwab
2016-04-03 11:40 ` Ingo Lohmar
2016-04-03 12:14 ` Alan Mackenzie
2016-04-03 12:30 ` Ingo Lohmar
2016-04-03 14:12 ` Andreas Schwab
2016-04-03 14:57 ` Ingo Lohmar [this message]
2016-04-03 15:08 ` Andreas Schwab
2016-04-03 15:12 ` Eli Zaretskii
2016-04-03 15:01 ` Eli Zaretskii
2016-04-03 15:23 ` Ingo Lohmar
2016-04-03 15:40 ` Eli Zaretskii
2016-04-03 16:00 ` Ingo Lohmar
2016-04-03 16:19 ` Eli Zaretskii
2016-04-03 16:24 ` Andreas Schwab
2016-04-03 17:09 ` Eli Zaretskii
2016-04-03 17:35 ` Andreas Schwab
2016-04-03 18:04 ` Eli Zaretskii
2016-04-03 11:44 ` Dmitry Gutov
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878u0ueo3x.fsf@acer.localhost.com \
--to=i.lohmar@gmail.com \
--cc=acm@muc.de \
--cc=emacs-devel@gnu.org \
--cc=kaushal.modi@gmail.com \
--cc=schwab@linux-m68k.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://git.savannah.gnu.org/cgit/emacs.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).