summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-29 03:34:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-29 03:34:48 (GMT)
commite6381080a7dd44e14fba81b5e3714661343d8e62 (patch)
tree7f301cb317d03ea1d66401dc57d13d15caf0bf6b /builtin/am.c
parented9806014d06fb1757a45d7f789859b91d9fb765 (diff)
parent6963893943dacc1a532d047c83ce905818dece46 (diff)
downloadgit-e6381080a7dd44e14fba81b5e3714661343d8e62.zip
git-e6381080a7dd44e14fba81b5e3714661343d8e62.tar.gz
git-e6381080a7dd44e14fba81b5e3714661343d8e62.tar.bz2
Merge branch 'ja/do-not-ask-needless-questions'
Git sometimes gives an advice in a rhetorical question that does not require an answer, which can confuse new users and non native speakers. Attempt to rephrase them. * ja/do-not-ask-needless-questions: git-filter-branch: be more direct in an error message read-tree -m: make error message for merging 0 trees less smart aleck usability: don't ask questions if no reply is required
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 8b218f9..0f63dca 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1312,7 +1312,7 @@ static int parse_mail(struct am_state *state, const char *mail)
}
if (is_empty_file(am_path(state, "patch"))) {
- printf_ln(_("Patch is empty. Was it split wrong?"));
+ printf_ln(_("Patch is empty."));
die_user_resolve(state);
}
@@ -1931,7 +1931,8 @@ static void am_resolve(struct am_state *state)
if (unmerged_cache()) {
printf_ln(_("You still have unmerged paths in your index.\n"
- "Did you forget to use 'git add'?"));
+ "You should 'git add' each file with resolved conflicts to mark them as such.\n"
+ "You might run `git rm` on a file to accept \"deleted by them\" for it."));
die_user_resolve(state);
}