From: Junio C Hamano <gitster@pobox.com>
To: "D. Ben Knoble" <ben.knoble+github@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] pull: allow branch.<name>.rebase to override pull.ff=only
Date: Tue, 22 Apr 2025 13:30:19 -0700 [thread overview]
Message-ID: <xmqq7c3c3pno.fsf@gitster.g> (raw)
In-Reply-To: <CALnO6CCMP5qS0f8oMyjav03CzT1AYSCiVCex1C7nqqxg=k7g-w@mail.gmail.com> (D. Ben Knoble's message of "Tue, 22 Apr 2025 16:07:05 -0400")
"D. Ben Knoble" <ben.knoble+github@gmail.com> writes:
>> > So it turns out my itch was already scratched.
>> ...
>> I left out the commit reference, whose message described what I think
>> I originally wanted:
>
> 6b37dff17f (pull: introduce a pull.rebase option to enable --rebase, 2011-11-06)
Good to know that your itch was already scratched ;-)
prev parent reply other threads:[~2025-04-22 20:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 3:06 [PATCH] pull: allow branch.<name>.rebase to override pull.ff=only D. Ben Knoble
2025-02-05 13:08 ` Junio C Hamano
2025-02-05 16:36 ` D. Ben Knoble
2025-02-05 17:42 ` Junio C Hamano
2025-02-05 21:14 ` D. Ben Knoble
2025-02-07 2:35 ` Alex Henrie
2025-02-10 20:26 ` D. Ben Knoble
2025-02-11 6:55 ` Alex Henrie
2025-04-22 20:03 ` D. Ben Knoble
2025-04-22 19:58 ` D. Ben Knoble
2025-04-22 20:05 ` D. Ben Knoble
2025-04-22 20:07 ` D. Ben Knoble
2025-04-22 20:30 ` Junio C Hamano [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=xmqq7c3c3pno.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ben.knoble+github@gmail.com \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).