diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:43:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:43:19 -0800 |
| commit | 2ef80c2d8998593852be2fb0546c8e4a518a6bf1 (patch) | |
| tree | 0907edcc74ec5fb9e1672aa3be963292778edd60 /Documentation | |
| parent | Merge branch 'nd/find-pack-entry-recent-cache-invalidation' (diff) | |
| parent | Use correct grammar in diffstat summary line (diff) | |
| download | tgif-2ef80c2d8998593852be2fb0546c8e4a518a6bf1.tar.xz | |
Merge branch 'nd/diffstat-gramnum'
* nd/diffstat-gramnum:
Use correct grammar in diffstat summary line
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitcore-tutorial.txt | 2 | ||||
| -rw-r--r-- | Documentation/gittutorial-2.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index c27d086f68..fb0d5692a4 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 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? |