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

Re: [PATCH 3/3] git commit: pathspec without -i/-o implies -i semantics during a merge

From
PBPieter de Bie <pdebie@ai.rug.nl>
Date
Jan 23, 2009, 09:51 UTC
Message-ID
<53513726-CE1C-4487-B775-440C6DC93DD8@ai.rug.nl>
In-Reply-To
<7vy6x235ky.fsf_-_@gitster.siamese.dyndns.org>
On 23 jan 2009, at 06:21, Junio C Hamano wrote:
Show 6 quoted lines
> This makes "git commit paths..." form default to "git commit -i paths"
> semantics only during a merge, restoring the pre-v1.3.0 behaviour.   
> The
> codepath to create a non-merge commit is not affected and still  
> defaults
> to the "--only" semantics.

Do you really want to do this? I think this is a pretty large change that can bite users if they don't know about this -- for example, because they forgot that they are in a merge (it happens..).

FWIW, I'd much rather see a useful error message than this change. If this change does get in, I think it should be well-documented in the man pages as well as in the release notes.

- Pieter
Previous: Junio C HamanoNext: Junio C Hamano
Message 15 of 17 in “Short "git commit $file" syntax fails in the face of a resolved conflict”
  1. Asheesh LaroiaJan 21, 2009
  2. Michael J GruberJan 21, 2009
  3. Nathan YerglerJan 21, 2009
  4. Johannes SixtJan 22, 2009
  5. Nanako ShiraishiJan 23, 2009
  6. Asheesh LaroiaJan 23, 2009
  7. Junio C HamanoJan 23, 2009
  8. 1/3 Add "partial commit" tests during a conflicted mergeJunio C Hamano, Jan 23, 2009
  9. Johannes SixtJan 23, 2009
  10. Junio C HamanoJan 23, 2009
  11. Johannes SixtJan 23, 2009
  12. Junio C HamanoJan 23, 2009
  13. 2/3 builtin-commit: shorten eye-sore overlong linesJunio C Hamano, Jan 23, 2009
  14. 3/3 git commit: pathspec without -i/-o implies -i semantics during a mergeJunio C Hamano, Jan 23, 2009
  15. Pieter de BieJan 23, 2009
  16. Junio C HamanoJan 23, 2009
  17. Michael J GruberJan 22, 2009

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.