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

Re: [PATCH] Documentation/git-merge.txt: weaken warning about uncommited changes

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Jun 18, 2013, 08:49 UTC
Message-ID
<CALkWK0=USVa2htHSTyj4C7FrKEko-e_UGAnu-3UNvx_ue1vwig@mail.gmail.com>
In-Reply-To
<1371544975-18703-1-git-send-email-Matthieu.Moy@imag.fr>
Matthieu Moy wrote:
Show 5 quoted lines
> Weaken the warning by discouraging only merge with /non-trivial/
> uncommited changes.
>
> I don't think documenting all the failure cases in the doc would be a
> good idea, so I've left the "in some cases" part.

It's already documented in the pre-merge checks section, as Jonathan pointed out [1]. We should update the documentation to point to it: I do not think "non-trivial" is much of an improvement.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/221069/focus=221366
Previous: Matthieu MoyNext: Matthieu Moy
Message 2 of 4 in “Documentation/git-merge.txt: weaken warning about uncommited changes”
  1. Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy, Jun 18, 2013
  2. Ramkumar RamachandraJun 18, 2013
  3. Matthieu MoyJun 18, 2013
  4. Junio C HamanoJun 18, 2013

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.