summaryrefslogtreecommitdiff
path: root/demo-script
diff options
context:
space:
mode:
authorLeonid Volnitsky <Leonid@Volnitsky.com>2008-06-18 22:08:55 +0300
committerLeonid Volnitsky <Leonid@Volnitsky.com>2008-06-18 22:30:41 +0300
commit84b842cc8190d8b0cc3c3a7eaa51b13d8bd6ac69 (patch)
treeb58e2adbfba1153414f19d49c3cbab79b1d91263 /demo-script
parentMerge branch 'git' (diff)
downloadgit-prompt-84b842cc8190d8b0cc3c3a7eaa51b13d8bd6ac69.tar.gz
git-prompt-84b842cc8190d8b0cc3c3a7eaa51b13d8bd6ac69.tar.bz2
git-prompt-84b842cc8190d8b0cc3c3a7eaa51b13d8bd6ac69.zip
script to make screen-shots
Diffstat (limited to 'demo-script')
-rw-r--r--demo-script38
1 files changed, 38 insertions, 0 deletions
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
+