From: "Venkat Naidu via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/1] Improve unpack trees error text
Date: Tue, 05 Nov 2019 23:13:00 +0000 [thread overview]
Message-ID: <pull.447.git.1572995581.gitgitgadget@gmail.com> (raw)
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 reply other threads:[~2019-11-05 23:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 23:13 Venkat Naidu via GitGitGadget [this message]
2019-11-05 23:13 ` [PATCH 1/1] Improve unpack trees error text naiduv via GitGitGadget
2019-11-05 23:49 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.447.git.1572995581.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.