From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: bruce.connor.am@gmail.com
Cc: Harald Hanche-Olsen <hanche@math.ntnu.no>,
emacs-devel <emacs-devel@gnu.org>
Subject: Re: [Emacs-diffs] master b6610d5 2/4: emacs-lisp/package.el: Refactor pre-execute prompt
Date: Wed, 08 Apr 2015 04:23:17 +0900 [thread overview]
Message-ID: <87bnizg2u2.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <CAAdUY-J7VOFVvURLu2o06E+jFS+MaKguuhzAhdA6i1_QZtRtSQ@mail.gmail.com>
Artur Malabarba writes:
> Once foo is merged into master, all the commits made in foo are added
> to master, and an additional merge commit is created.
That's a controversial interpretation. Not wrong, but many people
like to think of "the branch" as being a linear history following
first parents. AFAIK everybody agrees on the term "reachable from"
master to describe how commits from the source branch are "added to"
the target branch.
next prev parent reply other threads:[~2015-04-07 19:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150406102057.929.89886@vcs.savannah.gnu.org>
[not found] ` <E1Yf49K-0000G6-N0@vcs.savannah.gnu.org>
2015-04-06 10:51 ` [Emacs-diffs] master b6610d5 2/4: emacs-lisp/package.el: Refactor pre-execute prompt Dmitry Gutov
2015-04-06 11:05 ` Eli Zaretskii
2015-04-06 14:01 ` Artur Malabarba
2015-04-06 14:15 ` Eli Zaretskii
2015-04-06 15:22 ` Artur Malabarba
2015-04-06 16:01 ` Harald Hanche-Olsen
2015-04-06 16:25 ` Artur Malabarba
2015-04-06 16:54 ` Harald Hanche-Olsen
2015-04-06 17:01 ` Eli Zaretskii
2015-04-06 17:03 ` Harald Hanche-Olsen
2015-04-06 17:40 ` Artur Malabarba
2015-04-07 19:23 ` Stephen J. Turnbull [this message]
2015-04-06 13:49 ` Artur Malabarba
2015-04-06 21:22 ` Paul Eggert
2015-04-06 23:41 ` Artur Malabarba
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=87bnizg2u2.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=bruce.connor.am@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=hanche@math.ntnu.no \
/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).