mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'ja/do-not-ask-needless-questions' into maint
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
This commit is contained in:
commit
0501b7e785
|
@ -137,7 +137,7 @@ Merging
|
||||||
-------
|
-------
|
||||||
If `-m` is specified, 'git read-tree' can perform 3 kinds of
|
If `-m` is specified, 'git read-tree' can perform 3 kinds of
|
||||||
merge, a single tree merge if only 1 tree is given, a
|
merge, a single tree merge if only 1 tree is given, a
|
||||||
fast-forward merge with 2 trees, or a 3-way merge if 3 trees are
|
fast-forward merge with 2 trees, or a 3-way merge if 3 or more trees are
|
||||||
provided.
|
provided.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1312,7 +1312,7 @@ static int parse_mail(struct am_state *state, const char *mail)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_empty_file(am_path(state, "patch"))) {
|
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);
|
die_user_resolve(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1940,7 +1940,8 @@ static void am_resolve(struct am_state *state)
|
||||||
|
|
||||||
if (unmerged_cache()) {
|
if (unmerged_cache()) {
|
||||||
printf_ln(_("You still have unmerged paths in your index.\n"
|
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);
|
die_user_resolve(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1286,9 +1286,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||||
* new_branch && argc > 1 will be caught later.
|
* new_branch && argc > 1 will be caught later.
|
||||||
*/
|
*/
|
||||||
if (opts.new_branch && argc == 1)
|
if (opts.new_branch && argc == 1)
|
||||||
die(_("Cannot update paths and switch to branch '%s' at the same time.\n"
|
die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
|
||||||
"Did you intend to checkout '%s' which can not be resolved as commit?"),
|
argv[0], opts.new_branch);
|
||||||
opts.new_branch, argv[0]);
|
|
||||||
|
|
||||||
if (opts.force_detach)
|
if (opts.force_detach)
|
||||||
die(_("git checkout: --detach does not take a path argument '%s'"),
|
die(_("git checkout: --detach does not take a path argument '%s'"),
|
||||||
|
|
|
@ -226,9 +226,10 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
|
||||||
setup_work_tree();
|
setup_work_tree();
|
||||||
|
|
||||||
if (opts.merge) {
|
if (opts.merge) {
|
||||||
if (stage < 2)
|
|
||||||
die("just how do you expect me to merge %d trees?", stage-1);
|
|
||||||
switch (stage - 1) {
|
switch (stage - 1) {
|
||||||
|
case 0:
|
||||||
|
die("you must specify at least one tree to merge");
|
||||||
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
opts.fn = opts.prefix ? bind_merge : oneway_merge;
|
opts.fn = opts.prefix ? bind_merge : oneway_merge;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -239,7 +239,7 @@ git rev-parse --no-flags --revs-only --symbolic-full-name \
|
||||||
sed -e '/^^/d' "$tempdir"/raw-heads >"$tempdir"/heads
|
sed -e '/^^/d' "$tempdir"/raw-heads >"$tempdir"/heads
|
||||||
|
|
||||||
test -s "$tempdir"/heads ||
|
test -s "$tempdir"/heads ||
|
||||||
die "Which ref do you want to rewrite?"
|
die "You must specify a ref to rewrite."
|
||||||
|
|
||||||
GIT_INDEX_FILE="$(pwd)/../index"
|
GIT_INDEX_FILE="$(pwd)/../index"
|
||||||
export GIT_INDEX_FILE
|
export GIT_INDEX_FILE
|
||||||
|
|
4
help.c
4
help.c
|
@ -411,8 +411,8 @@ const char *help_unknown_cmd(const char *cmd)
|
||||||
|
|
||||||
if (SIMILAR_ENOUGH(best_similarity)) {
|
if (SIMILAR_ENOUGH(best_similarity)) {
|
||||||
fprintf_ln(stderr,
|
fprintf_ln(stderr,
|
||||||
Q_("\nDid you mean this?",
|
Q_("\nThe most similar command is",
|
||||||
"\nDid you mean one of these?",
|
"\nThe most similar commands are",
|
||||||
n));
|
n));
|
||||||
|
|
||||||
for (i = 0; i < n; i++)
|
for (i = 0; i < n; i++)
|
||||||
|
|
Loading…
Reference in a new issue