Repository navigation
GitVolt 0.7.1
Added
- Mark a folder resolved: right-click a folder in Conflicted (Tree view) and pick Mark N
files resolved to stage each conflicted file in it as it is, after regenerating them, say. If
some still have conflict markers, the row arms first and says how many. One Undo puts them all
back.
Changed
-
Merge tool, pick order: a conflict's output holds the ticked lines of the side you ticked
first, then the other's, so ticking Incoming then Current puts Incoming's lines first. Unticking
a side and ticking it again moves it to the end. -
Merge tool, first conflict: a file opens in the merge tool at its first conflict, or with
saved work, at the first one still to resolve. Coming back to it (another file, or its tab shown
again) keeps your place. -
Interactive rebase, bottom row: Squash and Fixup are greyed out on the commit replayed first
("Nothing below to fold into"), and S and F refuse it. Squashing a selection that includes it
makes it a Reword with the combined message, and fixing it up leaves it a Pick, so squashing the
whole branch works.
Fixed
- GitVolt no longer crashes at startup on Ubuntu systems where AppArmor denies user namespaces
outright ("credentials.cc:131] Check failed: . : Permission denied (13)"). It uses the setuid
sandbox helper directly there; the sandbox stays on.
Removed
- GitBolt's paused rebases: a rebase GitBolt left paused can no longer be continued in GitVolt;
finish or abort it in a terminal.