1 files changed, 27 insertions, 32 deletions
diff --git a/demo-script b/demo-script
index 2fa37a2..58e269a 100644
--- a/demo-script
+++ b/demo-script
@@ -1,38 +1,33 @@
-# git
-. /t/prompt/prompt
-rm -rf tiny.git/
-mkdir  tiny.git
-cd     tiny.git
-git init
-echo v1 > a-file
-git add a-file
-touch  an-untracked
-rm     an-untracked
-git commit -m v1 a-file
-
-
-..
+<<<<<<< HEAD:demo-script
 . /t/prompt/prompt 
+test -d demo && rm -rf demo/
+test -d ../demo && cd .. && rm -rf demo/ 
 clear
-rm -rf tiny.git/
-mkdir  tiny.git
-cd     tiny.git
+mkdir demo
+cd demo
 git init
-echo v1 > file
-git add file
-touch  untracked-file
-rm     untracked-file
-git commit -m v1 file
+echo "1st line" > FOO
+git add FOO
+touch  untracked.o
+rm     untracked.o
+git commit -q -m "1st line"  FOO
 git checkout -b test
-echo 'added 2nd line in test' >> file 
-git add file 
-git commit -m v2test
+echo "added 2nd line in test" >> FOO 
+git add FOO 
+echo "2nd FOO" > BAR
+git add BAR
+echo "added 3nd line" >> FOO 
+git add FOO
+git commit -q -m "FOO moded, BAR added"
 git checkout master
-cat file 
-echo 'now added 2nd line in master' >> file 
-git add file
-echo 'added 3nd line in master' >> file 
-git add file
-git commit -m v2
+cat FOO 
+echo "now added 2nd line in master" >> FOO 
+git add FOO
+git commit -q -m "2nd line"
 git merge test
-
+git-cat-file -p test:FOO > FOO
+git add FOO 
+git commit -q -m "merged"
+cat FOO
+git checkout HEAD^
+cat FOO