From: Eli Zaretskii <eliz@gnu.org>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: rpluim@gmail.com, eggert@cs.ucla.edu, 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 21:16:26 +0300 [thread overview]
Message-ID: <83364lgmth.fsf@gnu.org> (raw)
In-Reply-To: <877dtxp2sx.fsf@gnus.org> (message from Lars Ingebrigtsen on Mon, 17 Aug 2020 20:03:58 +0200)
> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: eggert@cs.ucla.edu, rpluim@gmail.com, emacs-devel@gnu.org
> Date: Mon, 17 Aug 2020 20:03:58 +0200
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> > Please don't. It can cause subtle problems in some rare cases. Or at
> > least that's how it was in the past.
>
> If so, it's changed. There's nothing magical much about rebasing:
I didn't say it was magical, I said it can cause subtle problems. I
forget the details, but rebasing after merging could bring the same
commit more than once. Or something like that.
Why do you feel the need to rebase? The default merge that pull does
is as "non-magical" as rebase.
> Seems pretty safe to me.
Until it isn't.
next prev parent reply other threads:[~2020-08-17 18:16 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83364lgmth.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
--cc=rpluim@gmail.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.