mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
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>
74 lines
1.3 KiB
Text
74 lines
1.3 KiB
Text
$ git log --patch-with-stat --summary master -- dir/
|
|
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
|
|
Merge: 9a6d494 c7a2ab9
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:04:00 2006 +0000
|
|
|
|
Merge branch 'side'
|
|
|
|
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:03:00 2006 +0000
|
|
|
|
Side
|
|
---
|
|
dir/sub | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 35d242b..7289e35 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -1,2 +1,4 @@
|
|
A
|
|
B
|
|
+1
|
|
+2
|
|
|
|
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:02:00 2006 +0000
|
|
|
|
Third
|
|
---
|
|
dir/sub | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 8422d40..cead32e 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -2,3 +2,5 @@ A
|
|
B
|
|
C
|
|
D
|
|
+E
|
|
+F
|
|
|
|
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:01:00 2006 +0000
|
|
|
|
Second
|
|
|
|
This is the second commit.
|
|
---
|
|
dir/sub | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 35d242b..8422d40 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -1,2 +1,4 @@
|
|
A
|
|
B
|
|
+C
|
|
+D
|
|
|
|
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:00:00 2006 +0000
|
|
|
|
Initial
|
|
$
|