From 32f70ea572d643ee8ff93f4b7b9137390857b3ed Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Wed, 18 Jun 2008 22:08:55 +0300 Subject: demo script (to make screen-shots) --- demo-script | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 demo-script (limited to 'demo-script') diff --git a/demo-script b/demo-script new file mode 100644 index 0000000..5fa0b61 --- /dev/null +++ b/demo-script @@ -0,0 +1,34 @@ +. /t/prompt/prompt +test -d demo && rm -rf demo/ +test -d ../demo && cd .. && rm -rf demo/ +clear +mkdir demo +cd demo +git init +### all git info is inside (). "M" - indicate master +echo "1st line" > file +### intersting files are shown and colored according to git state +### red - modified, green - added to index, blue - untracked, +git add file +touch untracked-file +rm untracked-file +git commit -m "1st line" file +git checkout -b test +echo 'added 2nd line in test' >> file +git add file +echo "2nd file" > file2 +git add file2 +echo 'added 3nd line in file, still in test' >> file +git add file +git commit -m "2nd and 3rd lines" +git checkout master +cat file +echo 'now added 2nd line in master' >> file +git add file +git commit -m v2 +git merge test +### magenta - operation in progress (merge, rebase, ...) +git-cat-file -p test:file > file +git add file +git commit -m merged + -- cgit v1.2.3