From: Denton Liu <liu.denton@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
Date: Wed, 17 Apr 2019 17:19:20 -0700 [thread overview]
Message-ID: <20190418001920.GA31901@dev-l> (raw)
In-Reply-To: <xmqqef62ozny.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote:
> * dl/rebase-i-keep-base (2019-04-16) 6 commits
> - rebase: teach rebase --keep-base
> - rebase: fast-forward --fork-point in more cases
> - rebase: fast-forward --onto in more cases
> - t3432: test rebase fast-forward behavior
> - t3431: add rebase --fork-point tests
> + tests (rebase): spell out the `--keep-empty` option
> (this branch is tangled with js/spell-out-options-in-tests.)
>
> "git rebase --keep-base <upstream>" tries to find the original base
> of the topic being rebased and rebase on top of that same base, which
> is useful when running the "git rebase -i" (and its limited variant
> "git rebase -x").
>
> Will merge to 'next'.
Since this patchset has grown in scope, could we update the description
to mention that rebase now fast-forwards in more cases? I think this
would be useful information for users to know when we write the release
notes.
Thanks,
Denton
prev parent reply other threads:[~2019-04-18 0:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
2019-04-16 15:26 ` Junio C Hamano
2019-04-17 7:18 ` Ævar Arnfjörð Bjarmason
2019-04-18 0:12 ` Junio C Hamano
2019-04-17 9:33 ` Duy Nguyen
2019-04-17 9:52 ` Phillip Wood
2019-04-17 10:22 ` Ævar Arnfjörð Bjarmason
2019-04-16 15:27 ` Ben Peart
2019-04-17 2:37 ` Junio C Hamano
2019-04-16 16:25 ` Stalled ds/ branches (was What's cooking in git.git (Apr 2019, #03; Tue, 16)) Derrick Stolee
2019-04-16 17:32 ` jt/clone-server-option " Jonathan Tan
2019-04-17 2:39 ` Junio C Hamano
2019-04-17 16:18 ` Jonathan Tan
2019-04-18 1:51 ` Junio C Hamano
2019-04-17 2:37 ` What's cooking in git.git (Apr 2019, #03; Tue, 16) Taylor Blau
2019-04-17 5:38 ` Junio C Hamano
2019-04-17 5:42 ` Taylor Blau
2019-04-17 6:14 ` Junio C Hamano
2019-04-18 6:54 ` Taylor Blau
2019-04-17 12:50 ` jc/format-patch-error-check, was " Johannes Schindelin
2019-04-18 0:48 ` Junio C Hamano
2019-04-17 12:52 ` ab/test-lib-pass-trace2-env, " Johannes Schindelin
2019-04-18 0:19 ` Denton Liu [this message]
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=20190418001920.GA31901@dev-l \
--to=liu.denton@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.
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.