Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Yuri Khan]

On Tue, 18 Aug 2020 at 03:32, Stefan Monnier <monnier@iro.umontreal.ca> wrote:

> No, I want the following:
>
> - I'm in a Git worktree with HEAD pointing at some local change of mine.
> - I do `git ..magical..merge..`
> - Now I'm in a worktree where HEAD was merged with the upstream branch
>   and the upstream branch (rather than HEAD) is the first branch.

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.