Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .changes/unreleased/Added-20250511-105903.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .changes/unreleased/Added-20250513-145103.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .changes/unreleased/Added-20250517-112348.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions .changes/unreleased/Added-20250521-144134.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions .changes/unreleased/Changed-20250521-195158.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/unreleased/Fixed-20250517-164653.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions .changes/unreleased/Fixed-20250524-064820.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions .changes/unreleased/Fixed-20250524-191824.yaml

This file was deleted.

13 changes: 13 additions & 0 deletions .changes/v0.14.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## <a name="v0.14.0">v0.14.0</a> - 2025-05-28
### Added
- branch checkout: Add 'spice.branchCheckout.trackUntrackedPrompt' configuration option to disable prompting to track untracked branches upon checkout.
- branch create: Add 'spice.branchCreate.prefix' configuration option to always add a configured prefix to new branches.
- Add more debug-level logging across the application to help diagnose issues.
- Support CTRL+j/k to navigate selection UIs that accept text input like branch selection.
### Changed
- Log output is now styled differently for better readability.
### Fixed
- branch split: Fix debug logs interrupting the branch name prompt.
- branch track: Fix incorrectly reporting an error when a branch needs to be restacked.
- If a remote branch reference (e.g. origin/feature) is deleted after pushing to it with gs, we will no longer hold onto the stale reference.
This better handles cases where the local and remote branches are both intended to be renamed.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).

## <a name="v0.14.0">v0.14.0</a> - 2025-05-28
### Added
- branch checkout: Add 'spice.branchCheckout.trackUntrackedPrompt' configuration option to disable prompting to track untracked branches upon checkout.
- branch create: Add 'spice.branchCreate.prefix' configuration option to always add a configured prefix to new branches.
- Add more debug-level logging across the application to help diagnose issues.
- Support CTRL+j/k to navigate selection UIs that accept text input like branch selection.
### Changed
- Log output is now styled differently for better readability.
### Fixed
- branch split: Fix debug logs interrupting the branch name prompt.
- branch track: Fix incorrectly reporting an error when a branch needs to be restacked.
- If a remote branch reference (e.g. origin/feature) is deleted after pushing to it with gs, we will no longer hold onto the stale reference.
This better handles cases where the local and remote branches are both intended to be renamed.

## <a name="v0.13.0">v0.13.0</a> - 2025-04-26
### Added
- log: Add `spice.log.crFormat = ("id" | "url")` configuration to change how CRs are listed in the log output. The default is "id".
Expand Down
4 changes: 2 additions & 2 deletions doc/src/cli/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ This option controls whether untracked branches are shown in the prompt.

### spice.branchCheckout.trackUntrackedPrompt

<!-- gs:version unreleased -->
<!-- gs:version v0.14.0 -->

If $$gs branch checkout$$ is used to checkout a branch that is not tracked,
git-spice will present a prompt like the following to begin tracking it:
Expand Down Expand Up @@ -102,7 +102,7 @@ and use the `--commit` flag to commit changes when needed.

### spice.branchCreate.prefix

<!-- gs:version unreleased -->
<!-- gs:version v0.14.0 -->

If set, the prefix will be prepended to the name of every branch created
with $$gs branch create$$.
Expand Down