summaryrefslogtreecommitdiff
path: root/demo-script
diff options
context:
space:
mode:
authorLeonid Volnitsky <Leonid@Volnitsky.com>2008-06-19 00:30:23 +0300
committerLeonid Volnitsky <Leonid@Volnitsky.com>2008-06-19 00:30:23 +0300
commit17c934f394f819db303ac3010fc1aa97a2071b3a (patch)
tree577933fd4a78c167a702f86541424062bf0da1dc /demo-script
parentfix: new file were not collected, sed expr corrected. (diff)
downloadgit-prompt-17c934f394f819db303ac3010fc1aa97a2071b3a.tar.gz
git-prompt-17c934f394f819db303ac3010fc1aa97a2071b3a.tar.bz2
git-prompt-17c934f394f819db303ac3010fc1aa97a2071b3a.zip
fix: sed expr to extract "new files"
Diffstat (limited to 'demo-script')
-rw-r--r--demo-script28
1 files changed, 14 insertions, 14 deletions
diff --git a/demo-script b/demo-script
index 5fa0b61..99e952c 100644
--- a/demo-script
+++ b/demo-script
@@ -2,33 +2,33 @@
test -d demo && rm -rf demo/
test -d ../demo && cd .. && rm -rf demo/
clear
-mkdir demo
-cd demo
+################################################################
+# prompt part related to git is inside (). "M" stands for master.
+# Intersting files are shown and colored according to git state.
+# Red - modified, green - added to index, blue - untracked,
+# magenta - operation in progress (merge, rebase, ...)
+#################################################################
+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 commit -q -m "1st line" file
git checkout -b test
-echo 'added 2nd line in test' >> file
+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
+echo "added 3nd line in file" >> file
git add file
-git commit -m "2nd and 3rd lines"
+git commit -q -m "2nd and 3rd lines"
git checkout master
cat file
-echo 'now added 2nd line in master' >> file
+echo "now added 2nd line in master" >> file
git add file
-git commit -m v2
+git commit -q -m "2nd line"
git merge test
-### magenta - operation in progress (merge, rebase, ...)
git-cat-file -p test:file > file
git add file
-git commit -m merged
-
+git commit -q -m "merged"