From: Robert Pluim <rpluim@gmail.com>
To: emacs-devel@gnu.org
Cc: Richard Stallman <rms@gnu.org>
Subject: Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Wed, 12 May 2021 10:16:33 +0200 [thread overview]
Message-ID: <874kf89xjy.fsf@gmail.com> (raw)
In-Reply-To: <20210512030949.65CD421128@vcs0.savannah.gnu.org> (Richard M. Stallman's message of "Tue, 11 May 2021 23:09:49 -0400 (EDT)")
>>>>> On Tue, 11 May 2021 23:09:49 -0400 (EDT), rms@gnu.org (Richard M. Stallman) said:
Richard> branch: master
Richard> commit 47070ed39eda524d334e5f82dc7f4a50b8d3252c
Richard> Merge: 67722ab 5784b42
Richard> Author: Richard Stallman <rms@gnu.org>
Richard> Commit: Richard Stallman <rms@gnu.org>
Richard> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Richard> What choice do I have?
Before pushing you can use 'git pull --rebase' to automatically update
to the HEAD of the branch youʼre on and then re-apply any commits
you've made. If you want to always do that, add 'rebase = true' to the
definition of your branch in .git/config. eg I have:
[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true
As far as I know emacs has no stated preference for merge vs rebase,
so all this is optional.
Robert
--
next parent reply other threads:[~2021-05-12 8:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210512030946.27770.7288@vcs0.savannah.gnu.org>
[not found] ` <20210512030949.65CD421128@vcs0.savannah.gnu.org>
2021-05-12 8:16 ` Robert Pluim [this message]
2021-05-12 12:50 ` master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Eli Zaretskii
2021-05-13 4:53 ` Richard Stallman
2021-05-13 6:38 ` Eli Zaretskii
2021-05-14 5:23 ` Richard Stallman
2021-05-14 7:00 ` Eli Zaretskii
2021-05-14 13:45 ` Stefan Monnier
2021-05-14 14:49 ` Andreas Schwab
2021-05-16 4:37 ` Richard Stallman
[not found] ` <20210512030948.6448F21128@vcs0.savannah.gnu.org>
2021-05-12 12:17 ` master 42596bd 2/6: Little improvements in rmail.el. Recognize encryped override headers Lars Ingebrigtsen
2021-05-12 13:12 ` Eli Zaretskii
2021-05-12 13:16 ` Lars Ingebrigtsen
2021-05-12 13:20 ` Eli Zaretskii
2021-05-12 15:14 ` Stefan Monnier
2021-05-12 15:45 ` Eli Zaretskii
2021-05-12 15:47 ` Lars Ingebrigtsen
2021-05-12 15:59 ` Eli Zaretskii
2021-05-12 15:54 ` Robert Pluim
2021-05-12 14:03 ` Gregory Heytings
2021-05-12 14:17 ` Gregory Heytings
2021-05-13 4:52 ` Richard Stallman
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=874kf89xjy.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=rms@gnu.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).