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

Re: [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve

From
Nanako Shiraishi <nanako3@lavabit.com>
Date
Dec 12, 2009, 09:19 UTC
Message-ID
<20091212181925.6117@nanako3.lavabit.com>
In-Reply-To
<1260608523-15579-3-git-send-email-gitster@pobox.com>
Quoting Junio C Hamano <gitster@pobox.com>
Show 5 quoted lines
>  # On branch side
>  # Unmerged paths:
>  #   (use "git reset HEAD <file>..." to unstage)
> -#   (use "git add <file>..." to mark resolution)
> +#   (use "git add/rm <file>..." as appropriately to mark resolution)
Shouldn't this either be "as appropriate" or just "appropriately"?
-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
Previous: Junio C HamanoNext: Sverre Rabbelier
Message 7 of 10 in “Update advice in commit/status output”
  1. 0/3 Update advice in commit/status outputJunio C Hamano, Dec 12, 2009
  2. 1/3 commit/status: check $GIT_DIR/MERGE_HEAD only onceJunio C Hamano, Dec 12, 2009
  3. 2/3 commit/status: "git add <path>" is not necessarily how to resolveJunio C Hamano, Dec 12, 2009
  4. 3/3 status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano, Dec 12, 2009
  5. Jeff KingDec 12, 2009
  6. Junio C HamanoDec 12, 2009
  7. Nanako ShiraishiDec 12, 2009
  8. Sverre RabbelierDec 12, 2009
  9. Junio C HamanoDec 12, 2009
  10. Jay SoffianDec 12, 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.