summaryrefslogtreecommitdiff
path: root/git-demo
diff options
context:
space:
mode:
Diffstat (limited to 'git-demo')
-rw-r--r--git-demo2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-demo b/git-demo
index eb2e34c..ca33522 100644
--- a/git-demo
+++ b/git-demo
@@ -23,7 +23,7 @@ echo 'main() {puts("Hello Universe!"); exit(0);}' > hello.c
git add hello.c
git commit -q -m "fixed exit code"
git merge universe
-git-cat-file -p universe:hello.c > hello.c
+git cat-file -p universe:hello.c > hello.c
git add hello.c
git commit -q -m "merged"
cat hello.c