[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Understanding a recent commit in emacs-25 branch [ed19f2]
From: |
Ingo Lohmar |
Subject: |
Re: Understanding a recent commit in emacs-25 branch [ed19f2] |
Date: |
Sun, 03 Apr 2016 16:57:54 +0200 |
User-agent: |
Notmuch/0.20.2+113~g6332e6e (http://notmuchmail.org) Emacs/25.0.90.1 (x86_64-pc-linux-gnu) |
On Sun, Apr 03 2016 16:12 (+0200), Andreas Schwab wrote:
> Ingo Lohmar <address@hidden> 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.
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Alan Mackenzie, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Andreas Schwab, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Ingo Lohmar, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Alan Mackenzie, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Ingo Lohmar, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Andreas Schwab, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2],
Ingo Lohmar <=
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Andreas Schwab, 2016/04/03
- Re: Understanding a recent commit in emacs-25 branch [ed19f2], Eli Zaretskii, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Eli Zaretskii, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Ingo Lohmar, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Eli Zaretskii, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Ingo Lohmar, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Eli Zaretskii, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Andreas Schwab, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Eli Zaretskii, 2016/04/03
Re: Understanding a recent commit in emacs-25 branch [ed19f2], Andreas Schwab, 2016/04/03