From: Robert Pluim <rpluim@gmail.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Lars Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org
Subject: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Date: Mon, 17 Aug 2020 17:37:33 +0200 [thread overview]
Message-ID: <m2v9hh2shu.fsf@gmail.com> (raw)
In-Reply-To: <jwv8sed9va2.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon, 17 Aug 2020 10:57:11 -0400")
>>>>> On Mon, 17 Aug 2020 10:57:11 -0400, Stefan Monnier <monnier@iro.umontreal.ca> said:
>> You forgot to add '--rebase' to your 'git pull'.
Stefan> Doesn't Git offer some way to *merge* (not rebase) but with the branches swapped?
Stefan> [ As if you merged HEAD into dest rather than the reverse ]
Probably, but I donʼt know how. I just set up git to auto-rebase, and
spare my limited brain cycles for other stuff :-)
Robert
next prev parent reply other threads:[~2020-08-17 15:37 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200816182558.16607.52991@vcs0.savannah.gnu.org>
[not found] ` <20200816182601.16F2A209AC@vcs0.savannah.gnu.org>
2020-08-16 18:34 ` master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Lars Ingebrigtsen
2020-08-16 19:03 ` Eli Zaretskii
2020-08-16 19:13 ` Lars Ingebrigtsen
2020-08-17 14:15 ` Robert Pluim
2020-08-17 14:57 ` Stefan Monnier
2020-08-17 15:37 ` Robert Pluim [this message]
2020-08-17 16:58 ` Eli Zaretskii
2020-08-17 16:03 ` Andreas Schwab
2020-08-17 19:54 ` Stefan Monnier
2020-08-17 20:05 ` Andreas Schwab
2020-08-17 20:31 ` Stefan Monnier
2020-08-18 9:41 ` Yuri Khan
2020-08-18 16:48 ` Stefan Monnier
2020-08-18 18:47 ` Yuri Khan
2020-08-19 5:16 ` Madhu
2020-08-19 13:15 ` Stefan Monnier
2020-08-17 15:58 ` Eli Zaretskii
2020-08-17 16:11 ` Paul Eggert
2020-08-17 16:26 ` Lars Ingebrigtsen
2020-08-17 16:29 ` Paul Eggert
2020-08-17 17:01 ` Lars Ingebrigtsen
2020-08-17 17:08 ` Eli Zaretskii
2020-08-17 18:03 ` Lars Ingebrigtsen
2020-08-17 18:16 ` Eli Zaretskii
2020-08-17 18:43 ` Lars Ingebrigtsen
2020-08-17 19:28 ` Eli Zaretskii
2020-08-17 20:05 ` David De La Harpe Golden
2020-08-18 19:02 ` Basil L. Contovounesios
2020-08-19 3:56 ` Amin Bandali
2020-08-19 13:04 ` Stephen Leake
2020-08-19 9:13 ` Rebasing vs. merging Teemu Likonen
2020-08-19 9:49 ` Kévin Le Gouguec
2020-08-19 14:51 ` Eli Zaretskii
2020-08-19 16:09 ` Paul Eggert
2020-08-19 16:22 ` John Wiegley
2020-08-17 18:45 ` Rebasing vs merging (was: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs) Óscar Fuentes
2020-08-17 17:02 ` master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Eli Zaretskii
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=m2v9hh2shu.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
--cc=monnier@iro.umontreal.ca \
/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).