diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2009-03-13 21:09:18 +0200 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2009-03-13 21:09:18 +0200 |
| commit | 646ca93318631d89fb22d4c26ba1a60eaca2c204 (patch) | |
| tree | c4635dd2c499e4ddae861add686cfac994749555 /demo-script | |
| parent | -- docs (diff) | |
| download | git-prompt-646ca93318631d89fb22d4c26ba1a60eaca2c204.tar.gz git-prompt-646ca93318631d89fb22d4c26ba1a60eaca2c204.tar.bz2 git-prompt-646ca93318631d89fb22d4c26ba1a60eaca2c204.zip | |
external config
Squashed commit of the following:
commit d2dd640947b803bfd0df4c68b841457ce543995d
Author: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Wed Mar 11 21:29:49 2009 +0200
-- if max_file_list_lenght==0 (disabled), then do not display "..."
commit 4dc94f9668b797142cbd525d2fc9137f615bc2db
Author: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Wed Mar 11 21:19:09 2009 +0200
-- switch git_module works
commit 7d7d3e1996d6834f2cccc900ac5bc626ff2ce6bb
Author: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Sun Mar 8 19:41:47 2009 +0200
-- colors are working
commit f1a8382bd7c4b2b1c27fc9908efa54f74290f06a
Merge: 876c85e 4a8777a
Author: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Sun Mar 8 18:25:52 2009 +0200
Merge branch 'master' into config
Conflicts:
index.txt
commit 876c85e87090c7de5740538666bdf558e30923b9
Author: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Fri Feb 20 13:44:52 2009 +0200
-- conf
Diffstat (limited to 'demo-script')
| -rwxr-xr-x | demo-script | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/demo-script b/demo-script new file mode 100755 index 0000000..1374a1f --- /dev/null +++ b/demo-script @@ -0,0 +1,40 @@ +cd p/git-prompt +. ./git-prompt.sh +cd +test -d demo && rm -rf demo/ +test -d ../demo && cd .. && rm -rf demo/ +clear +: ------------------------------------------------------------------------ +clear +mkdir demo +cd demo +git init +echo "1st line" > FOO +git add FOO +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 "2nd in BAR" > BAR +git add BAR +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 +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 HEAD +git clean -f +: ------------------------------------------------------------------------ +cd .. |