git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH 0/6] pull: improve default warning
@ 2020-11-24 13:30 Felipe Contreras
  2020-11-24 13:30 ` [PATCH 1/6] pull: refactor fast-forward check Felipe Contreras
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Felipe Contreras @ 2020-11-24 13:30 UTC (permalink / raw)
  To: git
  Cc: Vít Ondruch, Alex Henrie, Theodore Y . Ts'o, Jeff King,
	Junio C Hamano, Elijah Newren, Felipe Contreras

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/t5521-pull-options.sh      | 22 +++++-----
 t/t7601-merge-pull-config.sh |  8 +++-
 3 files changed, 61 insertions(+), 48 deletions(-)

-- 
2.29.2


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-11-24 13:34 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 13:30 [PATCH 0/6] pull: improve default warning Felipe Contreras
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

Code repositories for project(s) associated with this 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).