aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-21 14:56:39 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-21 14:56:39 -0800
commit093b194cc5570c825173a90538a4c212bc64bc7f (patch)
treeb6557708089548b930b8009e9639a0e4f98c9efa /Documentation
parentf3ccea8dd4ba03c8ed1971c317a14c1c34b61705 (diff)
parent7f814632f5d4d7af9f4225ece6039dbc44e03079 (diff)
downloadgit-093b194cc5570c825173a90538a4c212bc64bc7f.tar.gz
git-093b194cc5570c825173a90538a4c212bc64bc7f.tar.xz
Merge branch 'nd/diffstat-gramnum' into maint
* nd/diffstat-gramnum: Use correct grammar in diffstat summary line
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gittutorial-2.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index c27d086f6..fb0d5692a 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -1004,7 +1004,7 @@ Updating from ae3a2da... to a80b4aa....
Fast-forward (no commit created; -m option ignored)
example | 1 +
hello | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ 2 files changed, 2 insertions(+)
----------------
Because your branch did not contain anything more than what had
diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt
index f1e4422ac..e00a4d217 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?