git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] pull: warn if the user didn't say whether to rebase or to merge

From
Theodore Y. Ts'o <tytso@mit.edu>
Date
Feb 29, 2020, 03:03 UTC
Message-ID
<20200229030344.GG101220@mit.edu>
In-Reply-To
<xmqqeeuecngu.fsf@gitster-ct.c.googlers.com>
On Fri, Feb 28, 2020 at 03:16:01PM -0800, Junio C Hamano wrote:
Show 8 quoted lines
> > To
> > avoid that situation, Git should require users to explicitly specify
> > whether their primary workflow is a contributor/rebasing workflow or a
> > maintainer/merging workflow.
> 
> There is nothing Git "should" do.  There are things we wish Git did,
> and we give orders to the codebase to do so in our proposed log
> message.  Perhaps like:

I'd also note that there are some workflows that assume that --rebase is *never* a good thing, even for contributors. We can decide whether we want to bias the git man page in favor of one workflow as opposed to another, for the sake of new git users, but I don't think it's accurate to say (or even imply) that there are only two workflows: contributor/rebasing and maintainer/merging.

							- Ted
Previous: Junio C HamanoNext: Randall S. Becker
Message 3 of 5 in “pull: warn if the user didn't say whether to rebase or to merge”
  1. pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie, Feb 28, 2020
  2. Junio C HamanoFeb 28, 2020
  3. Theodore Y. Ts'oFeb 29, 2020
  4. Randall S. BeckerFeb 29, 2020
  5. Junio C HamanoFeb 29, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.