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

[PATCH 0/1] Improve unpack trees error text

From
VGVenkat Naidu via GitGitGadget <gitgitgadget@gmail.com>
Date
Nov 5, 2019, 23:13 UTC
Message-ID
<pull.447.git.1572995581.gitgitgadget@gmail.com>

Improve the following error text:error: Entry 'file.txt' not uptodate. Cannot merge.It would not appear as:error: Entry 'file.txt' is not up to date. Cannot merge.

naiduv (1):
  Improve unpack trees error text
 t/t7110-reset-merge.sh | 4 ++--
 unpack-trees.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
base-commit: da72936f544fec5a335e66432610e4cef4430991
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-447%2Fnaiduv%2Fpatch-2-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-447/naiduv/patch-2-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/447
-- 
gitgitgadget
Next: naiduv via GitGitGadget
Message 1 of 3 in “Improve unpack trees error text”
  1. 0/1 Improve unpack trees error textVenkat Naidu via GitGitGadget, Nov 5, 2019
  2. 1/1 Improve unpack trees error textnaiduv via GitGitGadget, Nov 5, 2019
  3. Elijah NewrenNov 5, 2019

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.