summaryrefslogtreecommitdiff
path: root/Documentation/tutorial-2.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-05 18:10:20 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-05 18:10:20 -0700
commitc49b5a3c891e34f6fea9f73847322e9447db91df (patch)
tree9ecc71e83c169bf60936afc01029dce3c50bb1e6 /Documentation/tutorial-2.txt
parentFix earlier mismerges. (diff)
parentgit alias: try alias last. (diff)
downloadtgif-c49b5a3c891e34f6fea9f73847322e9447db91df.tar.xz
Merge branch 'js/alias' into next
* js/alias: git alias: try alias last. If you have a config containing something like this: builtin-push: don't pass --thin to HTTP transport pack-objects: improve path grouping heuristics. rev-list: fix process_tree() conversion. Fix typo in tutorial-2.txt Fix Documentation/everyday.txt: Junio's workflow Add example xinetd(8) configuration to Documentation/everyday.txt read-tree: fix eye-candy. gitview: Add some useful keybindings.
Diffstat (limited to 'Documentation/tutorial-2.txt')
-rw-r--r--Documentation/tutorial-2.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index 82c692254e..894ca5e06f 100644
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -136,7 +136,7 @@ The "tree" object here refers to the new state of the tree:
------------------------------------------------
$ git ls-tree d0492b36
100644 blob a0423896973644771497bdc03eb99d5281615b51 file.txt
-$ git cat-file commit a0423896
+$ git cat-file blob a0423896
hello world!
------------------------------------------------