|
| From: | Stefan Monnier |
| Subject: | Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
| Date: | Tue, 18 Aug 2020 12:48:27 -0400 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
> The Emacs git porcelain that we Should Not Mention (Until Certain
> Things Happen) has bindings both to merge another branch into current
> *and* to merge current branch into another. By default, it suggests
> the upstream branch as long as git knows about it.
The question then becomes: how does Magit do that? (or does it come
with the same caveats that I mentioned regarding execution time,
treatment of non-committed changes, the set of files whose mtime is
affected, ...)
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |