Repository navigation
v0.22.0
Pre-release
Pre-release
Fixed
- Push right after opening a repository asks where to publish a branch, as it does later: pressed before the app had read the repository, it pushed without asking (or said the branch was detached).
Added
- Worktrees: a branch's menu → Open {branch} in a new worktree… checks it out in a folder of its own (next to the repository's by default) and opens it in a new tab, without switching branch here; both share their history and commits. A WORKTREES section in the side panel lists them (open in a tab, show the folder, copy its path, remove one, asking again when it has uncommitted changes) and forgets those whose folder was deleted by hand.
- Several commits at once: Ctrl+click (⌘ on macOS) adds a commit of the graph to those picked, Shift+click picks the ones between; right-click one of them to cherry-pick them all (oldest first), revert them all (newest first) or copy their SHAs. Undo takes the whole lot back.
- The interactive rebase and Checkout and merge with uncommitted changes in the way offer the same choice as a merge or a pull: stash them and bring them back once it is done (when the rebase stops at a commit to edit or for conflicts, they wait in the stash), or only stash them.
- Squash merge: a branch's menu → Merge {branch} into {current} as one commit (squash) stages its changes as one, and gives the commit box a message listing its commits (when nothing is typed in it); clashes are left as conflicts to resolve first. Undo takes it back.
- Compare two commits, a branch with the current one, or a commit with your changes: select a commit, right-click another one → Compare with …, selected before; or a branch's menu → Compare {current} with {branch}; or a commit's menu → Compare with my changes (working tree). The files that differ are listed with their diffs (images included), the two sides can be swapped, and Esc closes it.
- Conflicts that are easy to find and read: the conflict editor colours the code and marks the words that differ between the current and the incoming side, as the diff does, with line numbers. It opens at the first conflict, folds the long stretches without conflicts, marks each conflict by the scrollbar (orange, green once resolved; a click goes there), and "Conflict 1 of 3" with its arrows (or Alt+↑ / Alt+↓) goes from one to the next. The two sides show side by side or one over the other, with the same switch as the diff.