From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)
Date: Mon, 30 Apr 2018 15:33:55 +0000 [thread overview]
Message-ID: <CAM0VKjmkn7eyooKheOEQnS=6HMZSTbhejoxQdKB7W+n=7D5KuQ@mail.gmail.com> (raw)
In-Reply-To: <xmqq4ljtz87g.fsf@gitster-ct.c.googlers.com>
On Mon, Apr 30, 2018 at 5:25 AM, Junio C Hamano <gitster@pobox.com> wrote:
> * js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits
> - rebase --skip: clean up commit message after a failed fixup/squash
> - sequencer: always commit without editing when asked for
> - rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
> - rebase -i: demonstrate bugs with fixup!/squash! commit messages
> "git rebase -i" sometimes left intermediate "# This is a
> combination of N commits" message meant for the human consumption
> inside an editor in the final result in certain corner cases, which
> has been fixed.
> Will merge to 'next'.
This topic branches off from v2.16.3. However, its last patch uses
the sequencer's parse_head() function, which was only added in
v2.17.0-rc0~110^2~6 (sequencer: try to commit without forking 'git
commit', 2017-11-24), in topic 'pw/sequencer-in-process-commit',
leading to compilation errors.
next prev parent reply other threads:[~2018-04-30 15:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-30 3:25 What's cooking in git.git (Apr 2018, #04; Mon, 30) Junio C Hamano
2018-04-30 15:33 ` SZEDER Gábor [this message]
2018-05-01 13:46 ` Johannes Schindelin
2018-05-02 3:59 ` Junio C Hamano
2018-05-02 6:53 ` Johannes Schindelin
2018-05-02 10:46 ` Junio C Hamano
2018-05-02 1:36 ` Junio C Hamano
2018-04-30 19:17 ` js/no-pager-shorthand [was: What's cooking in git.git (Apr 2018, #04; Mon, 30)] Johannes Sixt
2018-05-01 11:57 ` Johannes Schindelin
2018-05-01 14:58 ` Johannes Sixt
2018-05-01 18:10 ` Eric Sunshine
2018-05-02 1:43 ` js/no-pager-shorthand [ Junio C Hamano
2018-05-01 18:46 ` js/no-pager-shorthand [was: What's cooking in git.git (Apr 2018, #04; Mon, 30)] Ævar Arnfjörð Bjarmason
2018-05-02 23:17 ` What's cooking in git.git (Apr 2018, #04; Mon, 30) Brandon Williams
2018-05-04 18:04 ` Elijah Newren
2018-05-07 4:39 ` Junio C Hamano
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAM0VKjmkn7eyooKheOEQnS=6HMZSTbhejoxQdKB7W+n=7D5KuQ@mail.gmail.com' \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 public inbox
https://80x24.org/mirrors/git.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).