diff options
Diffstat (limited to 'demo-script')
| -rwxr-xr-x | demo-script | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/demo-script b/demo-script index 1374a1f..ccd5019 100755 --- a/demo-script +++ b/demo-script @@ -2,7 +2,7 @@ cd p/git-prompt . ./git-prompt.sh cd test -d demo && rm -rf demo/ -test -d ../demo && cd .. && rm -rf demo/ +test -d ../demo && cd .. && rm -rf demo/ clear : ------------------------------------------------------------------------ clear @@ -15,21 +15,21 @@ touch untracked.o echo '*.o' >> .gitignore git commit -q -m "1st line" FOO git checkout -b test -echo "added 2nd line in test" >> FOO -git add FOO +echo "added 2nd line in test" >> FOO +git add FOO echo "2nd in BAR" > BAR git add BAR -echo "added 3nd line FOO" >> FOO +echo "added 3nd line FOO" >> FOO git add FOO git commit -q -m "FOO moded, BAR added" git checkout master -cat FOO -echo "now added 2nd line in master" >> FOO +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 add FOO git commit -q -m "merged" cat FOO git checkout HEAD^ |