summaryrefslogtreecommitdiff
path: root/Documentation/gitcore-tutorial.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 13:53:28 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-02 13:53:28 -0700
commit29c2a3dbadaa1c2d1128a4892241f82f5b34778c (patch)
treee89235283655640030f481b6c8f5b6af77535650 /Documentation/gitcore-tutorial.txt
parenta5f9ba99894f7e6e475bc7f8770c2098f2f73efb (diff)
parentdc801e71a72201f760618c6a706a31edccdc6fd2 (diff)
downloadgit-29c2a3dbadaa1c2d1128a4892241f82f5b34778c.tar.gz
Merge branch 'zj/diff-stat-smaller-num-columns'
Spend only minimum number of columns necessary to show the number of lines in the output from "diff --stat", instead of always allocating 4 columns even when showing changes that are much smaller than 1000 lines. By Zbigniew Jędrzejewski-Szmek * zj/diff-stat-smaller-num-columns: diff --stat: use less columns for change counts
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
-rw-r--r--Documentation/gitcore-tutorial.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index f5074a8976..9d893369a0 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -1002,8 +1002,8 @@ would be different)
----------------
Updating from ae3a2da... to a80b4aa....
Fast-forward (no commit created; -m option ignored)
- example | 1 +
- hello | 1 +
+ example | 1 +
+ hello | 1 +
2 files changed, 2 insertions(+)
----------------