From: David Caldwell <david@porkrind.org>
To: Eli Zaretskii <eliz@gnu.org>, David Kastrup <dak@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: State of the repository conversion
Date: Fri, 21 Mar 2014 12:01:25 -0700 [thread overview]
Message-ID: <532C8C85.70906@porkrind.org> (raw)
In-Reply-To: <8361n75rie.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1297 bytes --]
On 3/21/14, 11:35 AM, Eli Zaretskii wrote:
>> From: David Kastrup <dak@gnu.org>
>> Date: Fri, 21 Mar 2014 18:02:53 +0100
>>
>>> In some ancient discussion Linus said that a commit that doesn't bring
>>> in any diffs is "madness" and shouldn't exist. Or maybe I
>>> misunderstood.
>>
>> You probably misunderstood.
>
> Quite likely. But maybe you will be kind enough to explain what Linus
> meant in these two messages, when he said that an extra merge-commit
> is wrong and has "zero semantic information in it"?
>
> https://lists.ubuntu.com/archives/bazaar/2006q4/018265.html
> https://lists.ubuntu.com/archives/bazaar/2006q4/018273.html
He's saying that in the context of tracking a remote branch. He's saying
that if I'm pulling from your repo and I haven't made any changes, then
it's pretty rude of me to add random empty merges which only signify
when I happened to run the "pull" command. What I really want it to just
collect your changes and add them to my repo, using fast-forward merges
to move my branch to the latest commits.
In particular, I don't believe he is saying anything about merging
across release/master/feature branches. In fact, I've seen many people
advocate "git merge --no-ff" when merging important branches together.
-David
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4219 bytes --]
next prev parent reply other threads:[~2014-03-21 19:01 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-19 17:51 State of the repository conversion Eric S. Raymond
2014-03-19 18:14 ` Paul Eggert
2014-03-19 18:31 ` Eli Zaretskii
2014-03-19 18:54 ` Eric S. Raymond
2014-03-19 19:17 ` Eli Zaretskii
2014-03-20 0:08 ` Stephen J. Turnbull
2014-03-20 0:32 ` Eric S. Raymond
2014-03-20 1:01 ` Óscar Fuentes
2014-03-20 3:55 ` Eli Zaretskii
2014-03-20 4:09 ` Óscar Fuentes
2014-03-20 7:06 ` David Engster
2014-03-20 7:49 ` Steinar Bang
2014-03-20 16:35 ` Eli Zaretskii
2014-03-20 12:42 ` Óscar Fuentes
2014-03-20 14:03 ` Stefan
2014-03-20 15:09 ` Óscar Fuentes
2014-03-20 16:13 ` Eli Zaretskii
2014-03-20 20:23 ` Steinar Bang
2014-03-20 4:04 ` Eli Zaretskii
2014-03-20 4:25 ` Óscar Fuentes
2014-03-20 4:59 ` Stefan
2014-03-20 7:36 ` Steinar Bang
2014-03-20 7:48 ` Florian Weimer
2014-03-20 8:07 ` Steinar Bang
2014-03-20 16:19 ` Eli Zaretskii
2014-03-20 18:02 ` Stefan
2014-03-20 18:09 ` David Kastrup
2014-03-20 20:35 ` Steinar Bang
2014-03-20 18:15 ` Eli Zaretskii
2014-03-20 18:44 ` Stefan
2014-03-20 20:17 ` Eli Zaretskii
2014-03-20 20:30 ` Steinar Bang
2014-03-20 20:39 ` Eli Zaretskii
2014-03-20 21:10 ` Steinar Bang
2014-03-21 7:46 ` Eli Zaretskii
2014-03-21 12:40 ` Stefan
2014-03-21 12:57 ` Steinar Bang
2014-03-21 16:08 ` Eli Zaretskii
2014-03-21 17:02 ` David Kastrup
2014-03-21 18:35 ` Eli Zaretskii
2014-03-21 19:01 ` David Caldwell [this message]
2014-03-20 16:17 ` Eli Zaretskii
2014-03-20 19:28 ` Óscar Fuentes
2014-03-20 20:19 ` Eli Zaretskii
2014-03-20 20:31 ` Óscar Fuentes
2014-03-20 20:40 ` Eli Zaretskii
2014-03-20 20:46 ` Óscar Fuentes
2014-03-21 3:02 ` Stephen J. Turnbull
2014-03-21 8:01 ` Eli Zaretskii
2014-03-22 7:18 ` Stefan-W. Hahn
2014-03-19 21:25 ` Andreas Schwab
2014-03-20 3:49 ` Eli Zaretskii
2014-03-20 7:46 ` Steinar Bang
2014-03-20 16:09 ` Glenn Morris
2014-03-20 20:17 ` Steinar Bang
2014-03-20 20:21 ` Eli Zaretskii
2014-03-20 16:33 ` Eli Zaretskii
2014-03-20 21:00 ` Steinar Bang
2014-03-21 9:08 ` Eli Zaretskii
2014-03-21 9:38 ` Andreas Schwab
2014-03-21 9:53 ` Steinar Bang
2014-03-21 10:17 ` Eli Zaretskii
2014-03-21 12:30 ` Steinar Bang
2014-03-20 18:19 ` Andreas Schwab
2014-03-20 18:27 ` 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=532C8C85.70906@porkrind.org \
--to=david@porkrind.org \
--cc=dak@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@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 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.