diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:59 +0900 |
| commit | 0501b7e78564d11e87d228f7ffdbdb4b147145e3 (patch) | |
| tree | dd388bb6e4b8ca0bb876fe0ceec01379d492d0fc /git-filter-branch.sh | |
| parent | Merge branch 'bw/submodule-with-bs-path' into maint (diff) | |
| parent | git-filter-branch: be more direct in an error message (diff) | |
| download | tgif-0501b7e78564d11e87d228f7ffdbdb4b147145e3.tar.xz | |
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
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 2b8cdba157..aafaf708da 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 |