From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: git@vger.kernel.org, rcdailey.lists@gmail.com, newren@gmail.com,
rsbecker@nexbridge.com, annulen@yandex.ru, tytso@mit.edu
Subject: Re: [PATCH v5] pull: warn if the user didn't say whether to rebase or to merge
Date: Tue, 10 Mar 2020 13:16:01 -0700 [thread overview]
Message-ID: <xmqqk13shsou.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200310035420.1658876-1-alexhenrie24@gmail.com> (Alex Henrie's message of "Mon, 9 Mar 2020 21:54:20 -0600")
Alex Henrie <alexhenrie24@gmail.com> writes:
> Often novice Git users forget to say "pull --rebase" and end up with an
> unnecessary merge from upstream. What they usually want is either "pull
> --rebase" in the simpler cases, or "pull --ff-only" to update the copy
> of main integration branches, and rebase their work separately. The
> pull.rebase configuration variable exists to help them in the simpler
> cases, but there is no mechanism to make these users aware of it.
>
> Issue a warning message when no --[no-]rebase option from the command
> line and no pull.rebase configuration variable is given. This will
> inconvenience those who never want to "pull --rebase", who haven't had
> to do anything special, but the cost of the inconvenience is paid only
> once per user, which should be a reasonable cost to help a number of new
> users.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
> v5:
> - Supress warning when --quiet is given
> - Ensure that pull option tests still test what they're supposed to test
> - Add tests for the new warning
Thanks, will queue.
prev parent reply other threads:[~2020-03-10 20:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 3:54 [PATCH v5] pull: warn if the user didn't say whether to rebase or to merge Alex Henrie
2020-03-10 20:16 ` 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
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=xmqqk13shsou.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=annulen@yandex.ru \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=rcdailey.lists@gmail.com \
--cc=rsbecker@nexbridge.com \
--cc=tytso@mit.edu \
/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).