diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 01:20:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 01:20:59 (GMT) |
| commit | 0501b7e78564d11e87d228f7ffdbdb4b147145e3 (patch) | |
| tree | dd388bb6e4b8ca0bb876fe0ceec01379d492d0fc /Documentation/git-read-tree.txt | |
| parent | c95f0d2f9d616132db863992959b05545f8578cc (diff) | |
| parent | 6963893943dacc1a532d047c83ce905818dece46 (diff) | |
| download | git-0501b7e78564d11e87d228f7ffdbdb4b147145e3.zip git-0501b7e78564d11e87d228f7ffdbdb4b147145e3.tar.gz git-0501b7e78564d11e87d228f7ffdbdb4b147145e3.tar.bz2 | |
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 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index ed9d63e..02576d8 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -137,7 +137,7 @@ Merging ------- If `-m` is specified, 'git read-tree' can perform 3 kinds of 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. |