Compare commits

...

5 Commits

Author SHA1 Message Date
Josh Powell ed6b5f2221
Merge ce84456118 into d82669199b 2025-01-01 20:57:51 +01:00
Kalle Ahlström d82669199b
fix(af-magic): add logic for virtualenv separator (#12875) 2024-12-30 10:15:05 +01:00
dependabot[bot] 9c8afcc3ee
chore(deps): bump charset-normalizer in /.github/workflows/dependencies (#12874)
Bumps [charset-normalizer](https://github.com/jawah/charset_normalizer) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/jawah/charset_normalizer/releases)
- [Changelog](https://github.com/jawah/charset_normalizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jawah/charset_normalizer/compare/3.4.0...3.4.1)

---
updated-dependencies:
- dependency-name: charset-normalizer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-12-29 13:22:49 +01:00
Josh Powell ce84456118 Adds popular abort / continue 2019-07-24 09:49:44 -04:00
Josh Powell 84e39885c4
First pass at git-town aliases 2019-07-11 19:38:28 -04:00
4 changed files with 50 additions and 1 deletions

View File

@ -1,5 +1,5 @@
certifi==2024.12.14
charset-normalizer==3.4.0
charset-normalizer==3.4.1
idna==3.10
PyYAML==6.0.2
requests==2.32.3

View File

@ -0,0 +1,24 @@
# Git-Town plugin
This plugin adds completion and aliases for the `git-town` command. More information
at https://www.git-town.com.
Enable git-town plugin in your zshrc file:
```
plugins=(... git-town)
```
## Aliases
More information about `git-town` commands:
https://github.com/Originate/git-town#commands
| Alias | Command | Description |
|---------|----------------------------|----------------------------------------|
| `gt` | `git town` | Git-Town command |
| `gtab` | `git town abort` | Aborts the last run git-town command |
| `gtc` | `git town continue` | Restarts last after resolved conflict |
| `gth` | `git town hack` | New feature branch off main branch |
| `gtsy` | `git town sync` | Updates current branch w/ all changes |
| `gtnpr` | `git town new-pull-request`| Create a new pull request |
| `gtsh` | `git town ship` | Delivers feature branch and removes it |

View File

@ -0,0 +1,23 @@
#!zsh
#
# Installation
# ------------
#
# WIP
#Alias
| `gt` | `git town` | Git-Town command |
| `gtab` | `git town abort` | Aborts the last run git-town command |
| `gtc` | `git town continue` | Restarts last after resolved conflict |
| `gth` | `git town hack` | New feature branch off main branch |
| `gtsy` | `git town sync` | Updates current branch w/ all changes |
| `gtnpr` | `git town new-pull-request`| Create a new pull request |
| `gtsh` | `git town ship` | Delivers feature branch and removes it |
alias gt='git town'
alias gta='git town abort'
alias gtc='git town continue'
alias gth='git town hack'
alias gtsy='git town sync'
alias gtnpr='git town new-pull-request'
alias gtsh='git town ship'

View File

@ -13,6 +13,8 @@ function afmagic_dashes {
# the prompt, account for it when returning the number of dashes
if [[ -n "$python_env" && "$PS1" = *\(${python_env}\)* ]]; then
echo $(( COLUMNS - ${#python_env} - 3 ))
elif [[ -n "$VIRTUAL_ENV_PROMPT" && "$PS1" = *${VIRTUAL_ENV_PROMPT}* ]]; then
echo $(( COLUMNS - ${#VIRTUAL_ENV_PROMPT} ))
else
echo $COLUMNS
fi