7f814632f5
"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>
35 lines
555 B
Plaintext
35 lines
555 B
Plaintext
$ git diff-tree --root --patch-with-stat initial
|
|
444ac553ac7612cc88969031b02b3767fb8a353a
|
|
dir/sub | 2 ++
|
|
file0 | 3 +++
|
|
file2 | 3 +++
|
|
3 files changed, 8 insertions(+)
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
new file mode 100644
|
|
index 0000000..35d242b
|
|
--- /dev/null
|
|
+++ b/dir/sub
|
|
@@ -0,0 +1,2 @@
|
|
+A
|
|
+B
|
|
diff --git a/file0 b/file0
|
|
new file mode 100644
|
|
index 0000000..01e79c3
|
|
--- /dev/null
|
|
+++ b/file0
|
|
@@ -0,0 +1,3 @@
|
|
+1
|
|
+2
|
|
+3
|
|
diff --git a/file2 b/file2
|
|
new file mode 100644
|
|
index 0000000..01e79c3
|
|
--- /dev/null
|
|
+++ b/file2
|
|
@@ -0,0 +1,3 @@
|
|
+1
|
|
+2
|
|
+3
|
|
$
|