From 53dfa42e569602b0b5098f0aa2ceb1c35a7f9d59 Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Wed, 25 Jun 2008 21:14:32 +0300 Subject: new Makefile; renamed demo-scrip --> git-demo --- Makefile | 9 +++++++++ demo-script | 34 ---------------------------------- git-demo | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 34 deletions(-) create mode 100644 Makefile delete mode 100644 demo-script create mode 100644 git-demo diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ab43b62 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +install: + cp prompt /etc/ + +clean: + git clean -df + +tgit: + xclip -i git-demo + echo "ready to paste ..." diff --git a/demo-script b/demo-script deleted file mode 100644 index 69245e6..0000000 --- a/demo-script +++ /dev/null @@ -1,34 +0,0 @@ -set +xv -. /t/prompt/prompt -test -d demo && rm -rf demo/ -test -d ../demo && cd .. && rm -rf demo/ -clear -mkdir demo -cd demo -git init -echo "1st line" > FOO -git add FOO -touch untracked.o -rm untracked.o -git commit -q -m "FOO's 1st line" -git checkout -b test -echo "added 2nd line in test" >> FOO -git add FOO -echo "1st BAR" > BAR -git add BAR -echo "added 3nd line" >> 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 -git add FOO -git commit -q -m "2nd line" -git merge test -git-cat-file -p test:FOO > FOO -git add FOO -git commit -q -m "merged" -cat FOO -git checkout HEAD^ -cat FOO -git checkout master diff --git a/git-demo b/git-demo new file mode 100644 index 0000000..69245e6 --- /dev/null +++ b/git-demo @@ -0,0 +1,34 @@ +set +xv +. /t/prompt/prompt +test -d demo && rm -rf demo/ +test -d ../demo && cd .. && rm -rf demo/ +clear +mkdir demo +cd demo +git init +echo "1st line" > FOO +git add FOO +touch untracked.o +rm untracked.o +git commit -q -m "FOO's 1st line" +git checkout -b test +echo "added 2nd line in test" >> FOO +git add FOO +echo "1st BAR" > BAR +git add BAR +echo "added 3nd line" >> 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 +git add FOO +git commit -q -m "2nd line" +git merge test +git-cat-file -p test:FOO > FOO +git add FOO +git commit -q -m "merged" +cat FOO +git checkout HEAD^ +cat FOO +git checkout master -- cgit v1.2.3