diff options
author | Jeff King <peff@peff.net> | 2014-06-03 03:23:49 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 10:04:21 -0700 |
commit | d795216ac35f08e1ae2a706fca4c06a887c7d797 (patch) | |
tree | 4a843431db1eee9375e98ad27ed4dd8c1fb01044 /pack-redundant.c | |
parent | c057b2424a479a2219666f3806c0dd93867ca5c9 (diff) | |
download | git-d795216ac35f08e1ae2a706fca4c06a887c7d797.tar.gz |
error_resolve_conflict: drop quotations around operationjk/error-resolve-conflict-advice
When you try to commit with unmerged entries, you get an
error like:
$ git commit
error: 'commit' is not possible because you have unmerged files.
The quotes around "commit" are clunky; the user doesn't care
that this message is a template with the command-name filled
in. Saying:
error: commit is not possible because you have unmerged files
is easier to read. As this code is called from other places,
we may also end up with:
$ git merge
error: merge is not possible because you have unmerged files
$ git cherry-pick foo
error: cherry-pick is not possible because you have unmerged files
$ git revert foo
error: revert is not possible because you have unmerged files
All of which look better without the quotes. This also
happens to match the behavior of "git pull", which generates
a similar message (but does not share code, as it is a shell
script).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-redundant.c')
0 files changed, 0 insertions, 0 deletions