From ef9a372f80b6098d21e8fc8a2f72d9bfaa7d9d98 Mon Sep 17 00:00:00 2001 From: Mike Smith <10135646+mikesmithgh@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:45:10 -0400 Subject: [PATCH 1/7] docs: update demo --- scripts/git-prompt-string-demo.sh | 35 ++++++++++--------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/scripts/git-prompt-string-demo.sh b/scripts/git-prompt-string-demo.sh index c941b29..b130903 100755 --- a/scripts/git-prompt-string-demo.sh +++ b/scripts/git-prompt-string-demo.sh @@ -4,10 +4,11 @@ # gif generated with # ffmpeg -i git-prompt-string-demo.mov -r 5 frame%04d.png -# gifski --quality 97 --motion-quality 97 --lossy-quality 97 --width 1200 --height 627 -o git-prompt-string.gif frame*.png +# gifski --quality 99 --motion-quality 99 --lossy-quality 99 --width 1200 --height 627 -o git-prompt-string.gif frame*.png -win= # replace with kitty window ID -delay='0.2' +win="$1" # kitty window ID +char_delay='0.2' +feed_delay='2.5' if [[ -z "$win" ]]; then printf "Please povide kitty window ID" @@ -27,54 +28,40 @@ function feed_no_newline() { for ((i = 0; i < ${#str}; i++)); do char="${str:i:1}" kitty_send_text "$char" - sleep "$delay" + sleep "$char_delay" done } function feed() { feed_no_newline "$@" feed_str '\n' + sleep "$feed_delay" } function feed_str() { str="$1" kitty_send_text "$str" - sleep "$delay" + sleep "$char_delay" } feed clear -sleep 3 feed git reset --hard 7e47962 -feed vi README.md -feed '/Installation' -feed 'OTODO: add demo' -feed_str '\x1b' -feed ':wq' +feed 'sed -i "16s/$/TODO: add demo/" README.md' feed 'touch new_file.txt' feed 'rm -f new_file.txt' -feed git add . -feed 'git commit -m "chore: add TODO message"' -feed git merge -feed git mergetool -feed ':%diffg REMOTE' -feed ':wqa' +feed 'git commit -am "chore: add TODO message"' +feed 'git checkout --theirs README.md && git add .' feed 'git merge --abort' feed git rebase feed git rebase --abort feed 'git reset --hard @{u}' feed cd .git feed cd - -feed 'rm -rf tmp/bare_repo && mkdir -p tmp/bare_repo && cd tmp/bare_repo' -feed git init --bare -feed cd - -feed git bisect HEAD~3 -feed Y +feed git bisect start HEAD~3 feed git bisect reset feed git checkout -b demo_branch feed git push -u -sleep 2.5 feed git push origin :demo_branch -sleep 2.5 feed git checkout - feed git branch -d demo_branch feed clear From 295fd1c6162d72364bf64f5a09ecb62e2e8a38a4 Mon Sep 17 00:00:00 2001 From: Mike Smith <10135646+mikesmithgh@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:47:44 -0400 Subject: [PATCH 2/7] chore: fix script --- scripts/git-prompt-string-demo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/git-prompt-string-demo.sh b/scripts/git-prompt-string-demo.sh index b130903..15c66d4 100755 --- a/scripts/git-prompt-string-demo.sh +++ b/scripts/git-prompt-string-demo.sh @@ -50,6 +50,7 @@ feed 'sed -i "16s/$/TODO: add demo/" README.md' feed 'touch new_file.txt' feed 'rm -f new_file.txt' feed 'git commit -am "chore: add TODO message"' +feed git merge feed 'git checkout --theirs README.md && git add .' feed 'git merge --abort' feed git rebase From 0a6d0938f5a55198396ca68b38aaf97a65ed46db Mon Sep 17 00:00:00 2001 From: Mike <10135646+mikesmithgh@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:57:54 -0400 Subject: [PATCH 3/7] docs: add new demo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 22c83da..73165d3 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,7 @@ information about the current git branch and is inspired by [![go](https://img.shields.io/static/v1?style=flat-square&label=&message=v1.22.0&logo=go&labelColor=282828&logoColor=9dbad4&color=9dbad4)](https://go.dev/) [![semantic-release: angular](https://img.shields.io/static/v1?style=flat-square&label=semantic-release&message=angular&logo=semantic-release&labelColor=282828&logoColor=d8869b&color=8f3f71)](https://github.com/semantic-release/semantic-release) -![git-prompt-string](https://github.com/mikesmithgh/git-prompt-string/assets/10135646/80dd6b32-8155-4a07-9801-358f413ddbe8) - +![git-prompt-string](https://github.com/mikesmithgh/git-prompt-string/assets/10135646/b89014f7-1af0-4e7a-93c1-e062b2916d60) > [!WARNING]\ > 03/25/2024: git-prompt-string (previously bgps) is actively undergoing a major rewrite From d8d242c618e7f56c84ef7bf03e2296a2ae7f05ae Mon Sep 17 00:00:00 2001 From: Mike Smith <10135646+mikesmithgh@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:03:34 -0400 Subject: [PATCH 4/7] docs: update example text --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22c83da..03a27c3 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ mv git-prompt-string "$HOME/bin" # replace with your preferred directory that is ### Prompt configuration -Add git-prompt-string to your prompt. For example, +See the following for examples for a reference on how you could add git-prompt-string to your prompt. #### [bash](https://www.gnu.org/software/bash/) From 042f1c83ad165c6eaabf5d315ceee7934bdab42e Mon Sep 17 00:00:00 2001 From: Mike Smith <10135646+mikesmithgh@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:05:19 -0400 Subject: [PATCH 5/7] docs: update alternatives --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 03a27c3..766d3a5 100644 --- a/README.md +++ b/README.md @@ -359,4 +359,5 @@ color_merging = 'blue' - [bash-git-prompt](https://github.com/magicmonty/bash-git-prompt) - An informative and fancy bash prompt for Git users - [zsh-git-prompt](https://github.com/olivierverdier/zsh-git-prompt) - Informative git prompt for zsh - [starship](https://starship.rs/) - The minimal, blazing-fast, and infinitely customizable prompt for any shell! + - You can integrate git-prompt-string with starship or use starship's builtin git configurations. From decc6b4cddc428ec7b73a950772bc3a8f1df0563 Mon Sep 17 00:00:00 2001 From: Mike Smith <10135646+mikesmithgh@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:09:20 -0400 Subject: [PATCH 6/7] docs: update bgps message --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a91c809..7918938 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,10 @@ information about the current git branch and is inspired by ![git-prompt-string](https://github.com/mikesmithgh/git-prompt-string/assets/10135646/b89014f7-1af0-4e7a-93c1-e062b2916d60) -> [!WARNING]\ -> 03/25/2024: git-prompt-string (previously bgps) is actively undergoing a major rewrite +> [!INFO]\ +> Looking for [bgps](https://github.com/mikesmithgh/git-prompt-string/tree/v0.0.1)? git-prompt-string is the successor of bgps. +> bgps is still available on the tag [v0.0.1](https://github.com/mikesmithgh/git-prompt-string/tree/v0.0.1) > -> This is a breaking change that will simplify and improve maintainability of git-prompt-string -> -> If you prefer to keep using legacy bgps, then use the tag [v0.0.1](https://github.com/mikesmithgh/git-prompt-string/tree/v0.0.1) From 641a8921cd83d554a58186650de9a87552c3e314 Mon Sep 17 00:00:00 2001 From: Mike <10135646+mikesmithgh@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:12:33 -0400 Subject: [PATCH 7/7] docs: fix note --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7918938..988a053 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ information about the current git branch and is inspired by ![git-prompt-string](https://github.com/mikesmithgh/git-prompt-string/assets/10135646/b89014f7-1af0-4e7a-93c1-e062b2916d60) -> [!INFO]\ +> [!NOTE]\ > Looking for [bgps](https://github.com/mikesmithgh/git-prompt-string/tree/v0.0.1)? git-prompt-string is the successor of bgps. > bgps is still available on the tag [v0.0.1](https://github.com/mikesmithgh/git-prompt-string/tree/v0.0.1) >