diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 03:34:48 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 03:34:48 (GMT) |
commit | e6381080a7dd44e14fba81b5e3714661343d8e62 (patch) | |
tree | 7f301cb317d03ea1d66401dc57d13d15caf0bf6b /git-filter-branch.sh | |
parent | ed9806014d06fb1757a45d7f789859b91d9fb765 (diff) | |
parent | 6963893943dacc1a532d047c83ce905818dece46 (diff) | |
download | git-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 'git-filter-branch.sh')
-rwxr-xr-x | git-filter-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2b8cdba..aafaf70 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -239,7 +239,7 @@ git rev-parse --no-flags --revs-only --symbolic-full-name \ sed -e '/^^/d' "$tempdir"/raw-heads >"$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" export GIT_INDEX_FILE |