Nguyễn Thái Ngọc Duy 7f814632f5 Use correct grammar in diffstat summary line ...

"git diff --stat" and "git apply --stat" now learn to print the line
"%d files changed, %d insertions(+), %d deletions(-)" in singular form
whenever applicable. "0 insertions" and "0 deletions" are also omitted
unless they are both zero.

This matches how versions of "diffstat" that are not prehistoric produced
their output, and also makes this line translatable.

[jc: with help from Thomas Dickey in archaeology of "diffstat"]
[jc: squashed Jonathan's updates to illustrations in tutorials and a test]

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2012-02-03 23:19:42 -08:00

..

diff.config_format.subjectprefix_DIFFERENT_PREFIX

…

diff.diff_--abbrev_initial..side

…

diff.diff_--cached

diff: support --cached on unborn branches

2011-02-07 15:04:30 -08:00

diff.diff_--cached_--_file0

diff: support --cached on unborn branches

2011-02-07 15:04:30 -08:00

diff.diff_--dirstat_initial_rearrange

Teach --dirstat not to completely ignore rearranged lines within a file

2011-04-11 11:16:15 -07:00

diff.diff_--dirstat_master~1_master~2

Test diff --dirstat functionality

2009-02-20 00:02:48 -08:00

diff.diff_--dirstat-by-file_initial_rearrange

--dirstat-by-file: Make it faster and more correct

2011-04-11 10:12:24 -07:00

diff.diff_--name-status_dir2_dir

…

diff.diff_--no-index_--name-status_--_dir2_dir

diff: accept -- when using --no-index

2009-01-06 23:18:20 -08:00

diff.diff_--no-index_--name-status_dir2_dir

…

diff.diff_--no-index_dir_dir3

Skip timestamp differences for diff --no-index

2009-02-18 10:55:33 -08:00

diff.diff_--patch-with-raw_-r_initial..side

…

diff.diff_--patch-with-raw_initial..side

…

diff.diff_--patch-with-stat_-r_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff_--patch-with-stat_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff_--stat_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff_-r_--stat_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff_-r_initial..side

…

diff.diff_initial..side

…

diff.diff_master_master^_side

"git diff <tree>{3,}": do not reverse order of arguments

2008-10-12 12:36:19 -07:00

diff.diff-tree_--cc_--patch-with-stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--cc_--patch-with-stat_--summary_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--cc_--patch-with-stat_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--cc_--stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--cc_--stat_--summary_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--cc_--stat_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--cc_master

…

diff.diff-tree_--patch-with-raw_initial

…

diff.diff-tree_--patch-with-stat_initial

…

diff.diff-tree_--pretty_--patch-with-raw_initial

…

diff.diff-tree_--pretty_--patch-with-stat_initial

…

diff.diff-tree_--pretty_--patch-with-stat_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--pretty_--root_--patch-with-raw_initial

…

diff.diff-tree_--pretty_--root_--patch-with-stat_initial

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--pretty_--root_--stat_--summary_initial

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--pretty_--root_--stat_initial

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--pretty_--root_--summary_-r_initial

…

diff.diff-tree_--pretty_--root_--summary_initial

…

diff.diff-tree_--pretty_--root_-p_initial

…

diff.diff-tree_--pretty_--root_initial

…

diff.diff-tree_--pretty_--stat_--summary_initial

…

diff.diff-tree_--pretty_--stat_initial

…

diff.diff-tree_--pretty_--summary_initial

…

diff.diff-tree_--pretty_-p_initial

…

diff.diff-tree_--pretty_-p_side

…

diff.diff-tree_--pretty_initial

…

diff.diff-tree_--pretty_side

…

diff.diff-tree_--pretty=oneline_--patch-with-raw_initial

…

diff.diff-tree_--pretty=oneline_--patch-with-stat_initial

…

diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial

…

diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--pretty=oneline_--root_-p_initial

…

diff.diff-tree_--pretty=oneline_--root_initial

…

diff.diff-tree_--pretty=oneline_-p_initial

…

diff.diff-tree_--pretty=oneline_initial

…

diff.diff-tree_--root_--abbrev_initial

…

diff.diff-tree_--root_--patch-with-raw_initial

…

diff.diff-tree_--root_--patch-with-stat_initial

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_--root_-p_initial

…

diff.diff-tree_--root_-r_--abbrev_initial

…

diff.diff-tree_--root_-r_--abbrev=4_initial

…

diff.diff-tree_--root_-r_initial

…

diff.diff-tree_--root_initial

…

diff.diff-tree_-c_--abbrev_master

…

diff.diff-tree_-c_--stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_-c_--stat_--summary_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_-c_--stat_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.diff-tree_-c_master

…

diff.diff-tree_-p_-m_master

…

diff.diff-tree_-p_initial

…

diff.diff-tree_-p_master

…

diff.diff-tree_-r_--abbrev_initial

…

diff.diff-tree_-r_--abbrev=4_initial

…

diff.diff-tree_-r_initial

…

diff.diff-tree_initial

…

diff.diff-tree_master

…

diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--attach_--stdout_initial..master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--attach_--stdout_initial..master^

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--attach_--stdout_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--inline_--stdout_--numbered-files_initial..master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--inline_--stdout_initial..master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--inline_--stdout_initial..master^

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--inline_--stdout_initial..master^^

format-patch: --attach/inline uses filename instead of SHA1

2009-03-22 21:45:19 -07:00

diff.format-patch_--inline_--stdout_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--stdout_--cover-letter_-n_initial..master^

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--stdout_--no-numbered_initial..master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--stdout_--numbered_initial..master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--stdout_initial..master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--stdout_initial..master^

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.format-patch_--stdout_initial..side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--decorate_--all

--dirstat: Describe non-obvious differences relative to --stat or regular diff

2011-04-11 10:11:17 -07:00

diff.log_--decorate=full_--all

--dirstat: Describe non-obvious differences relative to --stat or regular diff

2011-04-11 10:11:17 -07:00

diff.log_--patch-with-stat_--summary_master_--_dir_

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--patch-with-stat_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--patch-with-stat_master_--_dir_

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--root_--cc_--patch-with-stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--root_--patch-with-stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--root_--patch-with-stat_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--root_-c_--patch-with-stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.log_--root_-p_master

log: do not print ellipses with --abbrev-commit

2009-02-13 17:18:22 -08:00

diff.log_--root_master

log: do not print ellipses with --abbrev-commit

2009-02-13 17:18:22 -08:00

diff.log_-GF_-p_--pickaxe-all_master

diff/log -G<pattern>: tests

2010-08-31 14:30:29 -07:00

diff.log_-GF_-p_master

diff/log -G<pattern>: tests

2010-08-31 14:30:29 -07:00

diff.log_-GF_master

diff/log -G<pattern>: tests

2010-08-31 14:30:29 -07:00

diff.log_-m_-p_--first-parent_master

t4013: add tests for log -p -m --first-parent

2010-03-09 01:11:18 -08:00

diff.log_-m_-p_master

t4013: add tests for log -p -m --first-parent

2010-03-09 01:11:18 -08:00

diff.log_-p_--first-parent_master

t4013: add tests for log -p -m --first-parent

2010-03-09 01:11:18 -08:00

diff.log_-p_master

log: do not print ellipses with --abbrev-commit

2009-02-13 17:18:22 -08:00

diff.log_-S_F_master

diff: parse separate options like -S foo

2010-08-06 09:14:22 -07:00

diff.log_-SF_-p_master

…

diff.log_-SF_master

…

diff.log_-SF_master_--max-count=0

log: fix --max-count when used together with -S or -G

2011-03-09 14:28:24 -08:00

diff.log_-SF_master_--max-count=1

log: fix --max-count when used together with -S or -G

2011-03-09 14:28:24 -08:00

diff.log_-SF_master_--max-count=2

log: fix --max-count when used together with -S or -G

2011-03-09 14:28:24 -08:00

diff.log_master

log: do not print ellipses with --abbrev-commit

2009-02-13 17:18:22 -08:00

diff.rev-list_--children_HEAD

Test rev-list --parents/--children

2009-02-20 00:02:48 -08:00

diff.rev-list_--parents_HEAD

Test rev-list --parents/--children

2009-02-20 00:02:48 -08:00

diff.show_--first-parent_master

show --first-parent/-m: do not default to --cc

2010-03-09 01:11:19 -08:00

diff.show_--patch-with-raw_side

…

diff.show_--patch-with-stat_--summary_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.show_--patch-with-stat_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.show_--root_initial

…

diff.show_--stat_--summary_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.show_--stat_side

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.show_-c_master

show -c: show patch text

2010-03-09 01:11:18 -08:00

diff.show_-m_master

show --first-parent/-m: do not default to --cc

2010-03-09 01:11:19 -08:00

diff.show_initial

…

diff.show_master

log: do not print ellipses with --abbrev-commit

2009-02-13 17:18:22 -08:00

diff.show_side

…

diff.whatchanged_--patch-with-stat_--summary_master_--_dir_

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.whatchanged_--patch-with-stat_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.whatchanged_--patch-with-stat_master_--_dir_

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.whatchanged_--root_--patch-with-stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.whatchanged_--root_--patch-with-stat_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.whatchanged_--root_-c_--patch-with-stat_--summary_master

Use correct grammar in diffstat summary line

2012-02-03 23:19:42 -08:00

diff.whatchanged_--root_-p_master

…

diff.whatchanged_--root_master

…

diff.whatchanged_-p_master

…

diff.whatchanged_-SF_-p_master

…

diff.whatchanged_-SF_master

…

diff.whatchanged_master

…