From 84b842cc8190d8b0cc3c3a7eaa51b13d8bd6ac69 Mon Sep 17 00:00:00 2001
From: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Wed, 18 Jun 2008 22:08:55 +0300
Subject: script to make screen-shots

---
 demo-script | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 demo-script

(limited to 'demo-script')

diff --git a/demo-script b/demo-script
new file mode 100644
index 0000000..2fa37a2
--- /dev/null
+++ b/demo-script
@@ -0,0 +1,38 @@
+# 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
+
+
+..
+. /t/prompt/prompt 
+clear
+rm -rf tiny.git/
+mkdir  tiny.git
+cd     tiny.git
+git init
+echo v1 > file
+git add file
+touch  untracked-file
+rm     untracked-file
+git commit -m v1 file
+git checkout -b test
+echo 'added 2nd line in test' >> file 
+git add file 
+git commit -m v2test
+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
+git merge test
+
-- 
cgit v1.2.3