Skip to content

v0.35.5

Choose a tag to compare

@airiclenz airiclenz released this 18 Nov 11:31
· 43 commits to main since this release

apogee — v0.35.5 — 2026-11-18

This release makes apogee's git support work in more repositories, and says plainly when it will not.

Improved

  • Git tools keep working in a repository that sets its own merge driver — A repository whose own git config names a merge driver (merge.<name>.driver) no longer shuts you out of apogee's git tools and footer actions: apogee switches that driver off for every git call and refuses only commands that would merge file contents, such as rebase, cherry-pick, revert or a merge that is not fast-forward-only, with a message naming the setting. Aborting or quitting an operation already in progress is never refused, and a merge driver in your global git config still runs as before.
  • The footer shows when apogee refuses a repository's git — In a repository whose own config names a program git would run (a repo-local core.sshCommand, for example), the footer's git segment now reads git refused in the error colour instead of vanishing, and a one-time note names the setting and suggests moving it to your global git config if you trust it. /git, or a click on the marker, gives that same explanation instead of "no git here".

Fixed

  • A refused footer rebase no longer reports a confusing abort failure — When the footer's rebase onto upstream is refused before it starts, the note now gives just the reason, without a conflict list or the misleading "rebase --abort also failed: no rebase in progress"; status, fetch, pull, push and branch switching from the footer keep working in such a repository.

Docs & install

  • Manual covers repository-level git settings — The manual now explains the git refused footer marker and its note, how to clear it through your global git config, and that a merge driver set in the repository itself now works with apogee, with only the footer's rebase refused.