list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Felipe Contreras <>
Cc: "Vít Ondruch" <>,
	"Alex Henrie" <>,
	"Theodore Y . Ts'o" <>, "Jeff King" <>,
	"Junio C Hamano" <>,
	"Elijah Newren" <>,
	"Felipe Contreras" <>
Subject: [PATCH 0/6] pull: improve default warning
Date: Tue, 24 Nov 2020 07:30:31 -0600	[thread overview]
Message-ID: <> (raw)

This patch series attempts to silence a bit more the default pull warning (when no pull.rebase is
configured, or pull.ff).

Basically; display the warning only when a fast-forward merge is not possible.

More work is needed to add a ff-only option.

Felipe Contreras (6):
  pull: refactor fast-forward check
  pull: cleanup autostash check
  pull: trivial cleanup
  pull: move default warning
  pull: display default warning only when non-ff
  test: pull-options: revert unnecessary changes

 builtin/pull.c               | 79 ++++++++++++++++++++----------------
 t/      | 22 +++++-----
 t/ |  8 +++-
 3 files changed, 61 insertions(+), 48 deletions(-)


             reply	other threads:[~2020-11-24 13:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-24 13:30 Felipe Contreras [this message]
2020-11-24 13:30 ` [PATCH 1/6] pull: refactor fast-forward check Felipe Contreras
2020-11-24 13:30 ` [PATCH 2/6] pull: cleanup autostash check Felipe Contreras
2020-11-24 13:30 ` [PATCH 3/6] pull: trivial cleanup Felipe Contreras
2020-11-24 13:30 ` [PATCH 4/6] pull: move default warning Felipe Contreras
2020-11-24 13:30 ` [PATCH 5/6] pull: display default warning only when non-ff Felipe Contreras
2020-11-24 13:30 ` [PATCH 6/6] test: pull-options: revert unnecessary changes Felipe Contreras

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \

* 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 inbox:

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).