diff --git a/.github/issue_template.md b/.github/issue_template.md index 8adeb474..ac05f350 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -4,7 +4,7 @@ ## Check list -- [ ] I have read through the [README](https://github.com/wfxr/forgit/blob/master/README.md) +- [ ] I have read through the [README](https://github.com/wfxr/forgit/blob/main/README.md) - [ ] I have the latest version of forgit - [ ] I have searched through the existing issues diff --git a/.github/scripts/tag.sh b/.github/scripts/tag.sh index e3e1c7c8..7c0f24d3 100755 --- a/.github/scripts/tag.sh +++ b/.github/scripts/tag.sh @@ -8,7 +8,7 @@ git log --color=always --format="%C(auto)%h %s%d" | head if [[ ${head_tag} =~ [\d{2}\.\d{2}\.\d+] ]] then - echo "Current master already has version tag ${head_tag}" + echo "Version tag ${head_tag} already exists." else git config --local user.email "github-actions@users.noreply.github.com" git config --local user.name "github-actions" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9764f1e8..fdab5fe0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: ci # Controls when the action will run. Triggers the workflow on push or pull request -# events, but only for the master branch +# events, but only for the default branch on: push: branches: diff --git a/README.md b/README.md index c0f24ccc..9e7729ca 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Then add the following to your shell's config file: ## Arch User Repository -[AUR](https://wiki.archlinux.org/title/Arch_User_Repository) packages, maintained by the developers of forgit, are available. Install the [forgit](https://aur.archlinux.org/packages/forgit) package for the latest release or [forgit-git](https://aur.archlinux.org/packages/forgit-git) to stay up to date with the latest commits from the master branch of this repository. +[AUR](https://wiki.archlinux.org/title/Arch_User_Repository) packages, maintained by the developers of forgit, are available. Install the [forgit](https://aur.archlinux.org/packages/forgit) package for the latest release or [forgit-git](https://aur.archlinux.org/packages/forgit-git) to stay up to date with the latest commits from the default branch of this repository. # 📝 Features @@ -346,9 +346,9 @@ export FORGIT_LOG_FZF_OPTS=' ## Bash -- Put [`completions/git-forgit.bash`](https://github.com/wfxr/forgit/blob/master/completions/git-forgit.bash) in +- Put [`completions/git-forgit.bash`](https://github.com/wfxr/forgit/blob/main/completions/git-forgit.bash) in `~/.local/share/bash-completion/completions` to have bash tab completion for `git forgit` and configured git aliases. -- Source [`completions/git-forgit.bash`](https://github.com/wfxr/forgit/blob/master/completions/git-forgit.bash) explicitly to have +- Source [`completions/git-forgit.bash`](https://github.com/wfxr/forgit/blob/main/completions/git-forgit.bash) explicitly to have bash tab completion for forgit shell functions and aliases (e.g., `gcb ` completes branches). ## Zsh @@ -364,7 +364,7 @@ If you're having issues after updating, and commands such as `forgit::add` or al # 💡 Tips -- Most of the commands accept optional arguments (e.g., `glo develop`, `glo f738479..188a849b -- main.go`, `gco master`). +- Most of the commands accept optional arguments (e.g., `glo develop`, `glo f738479..188a849b -- main.go`, `gco main`). - `gd` supports specifying revision(e.g., `gd HEAD~`, `gd v1.0 README.md`). - Call `gi` with arguments to get the wanted `.gitignore` contents directly(e.g., `gi cmake c++`).