From: "Gerd Möllmann" <gerd.moellmann@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: acorallo@gnu.org, emacs-devel@gnu.org
Subject: Re: scratch/igc as feature branch
Date: Thu, 04 Jul 2024 08:14:24 +0200 [thread overview]
Message-ID: <m24j95smyn.fsf@pro2.fritz.box> (raw)
In-Reply-To: <86sewpahi8.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 04 Jul 2024 07:49:35 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Gerd Möllmann <gerd.moellmann@gmail.com>
>> Cc: emacs-devel@gnu.org
>> Date: Wed, 03 Jul 2024 21:29:49 +0200
>>
>> Does it mean that in the end, before merging, every commit must have a
>> conforming commit message?
>
> No, we only need to provide a commit log message that describes the
> changes wrt the revision before the merge. For example, a new file or
> a new function that saw gobs of commits on the branch needs only to be
> mentioned as new file or new function. Other places need to be
> mentioned as if all the changes were done in one go, and changes which
> were later reverted don't need to be mentioned at all.
>
> IOW, think about describing the merge "as if" you've rebased the
> branch onto master (I say "as if" because IMO actually rebasing is not
> a good idea).
Let try me formulate in my own words what I understood, to see it is
right.
The commits before the merge don't need new new commit messages. So,
there's is no interactive rebasing required. The commit message of the
merge consists of a change log entry describing all effective changes
between master and igc at that time (it describes the diff at that
time.
Right?
>> Also, there are probably many hundreds of commits that are not in
>> scratch/igc at all, but only in my original. What's with those?
>
> If they don't affect the code after the merge, they don't need to be
> mentioned in the commit log message. Or did you mean something other
> than commit log messages?
Well, Andrea talked about the importance of history. And >50% of the
history are not on savannah. I guess I just don't understand what he
means with history which should be preserved or how h expressed it.
next prev parent reply other threads:[~2024-07-04 6:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-03 12:40 scratch/igc as feature branch Andrea Corallo
2024-07-03 17:44 ` Gerd Möllmann
2024-07-03 19:01 ` Andrea Corallo
2024-07-03 19:29 ` Gerd Möllmann
2024-07-03 19:37 ` Gerd Möllmann
2024-07-04 4:58 ` Eli Zaretskii
2024-07-04 6:19 ` Gerd Möllmann
2024-07-03 22:04 ` Andrea Corallo
2024-07-04 4:15 ` Gerd Möllmann
2024-07-04 6:15 ` Eli Zaretskii
2024-07-04 4:49 ` Eli Zaretskii
2024-07-04 6:14 ` Gerd Möllmann [this message]
2024-07-04 6:26 ` Eli Zaretskii
2024-07-04 6:55 ` Gerd Möllmann
2024-07-04 7:41 ` 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=m24j95smyn.fsf@pro2.fritz.box \
--to=gerd.moellmann@gmail.com \
--cc=acorallo@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.