summaryrefslogtreecommitdiff
path: root/Documentation/gittutorial-2.txt
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-02-01 19:55:07 +0700
committerJunio C Hamano <gitster@pobox.com>2012-02-03 23:19:42 -0800
commit7f814632f5d4d7af9f4225ece6039dbc44e03079 (patch)
tree67351306175c9ccb96af4bb5456e04ddef0787d1 /Documentation/gittutorial-2.txt
parent828ea97de486c1693d6e4f2c7347acb50235a85d (diff)
downloadgit-7f814632f5d4d7af9f4225ece6039dbc44e03079.tar.gz
Use correct grammar in diffstat summary linend/diffstat-gramnum
"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>
Diffstat (limited to 'Documentation/gittutorial-2.txt')
-rw-r--r--Documentation/gittutorial-2.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt
index f1e4422acc..e00a4d2170 100644
--- a/Documentation/gittutorial-2.txt
+++ b/Documentation/gittutorial-2.txt
@@ -34,12 +34,12 @@ $ echo 'hello world' > file.txt
$ git add .
$ git commit -a -m "initial commit"
[master (root-commit) 54196cc] initial commit
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
create mode 100644 file.txt
$ echo 'hello world!' >file.txt
$ git commit -a -m "add emphasis"
[master c4d59f3] add emphasis
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------
What are the 7 digits of hex that git responded to the commit with?