Repository navigation
git-edit 1.11.0 runs a lost race again by itself, lands moves and placements 1.10.0 refused as taking in a later change, and puts each refusal's remedy on its trailer line.
Highlights
- A run that loses the race runs itself again on the new tip, up to twice, each loss named as it goes – where a refused run used to be rerun by hand. It does so only where a fresh run composes it all again from the same arguments, so never an
--exec, a--continueor a--text - - Every refusal's trailer carries its remedy. A caller keeping only the
git-edit:line learns there what to do next – the--waitfor another session's pause, the saved output of a failed check, the first entry and count of a list, the commits writing a line--editscan't find - A squash into a newer target replays its older commits right before it, as the target was built on them, instead of after it as fixups – so it no longer stops on the target's own pick. The fold keeps the target's authorship, and
--text,-m's message or its own - More moves, placements and removals land. A placement moving a line a later commit rewords and a move past a code relocation were refused as taking in a later change, and a removal as taking back what another caller landed on its file, though that content had moved into other files the commit changes – each now lands
- A fold that needs lines a later commit adds is shown how to move them. Its refusal names a
--splitof that commit into those lines as afixup!of the target, which keeps the tip as it was
Upgrading from 1.10.0
- A lost race reruns itself –
GIT_EDIT_NO_RERUN=1keeps every loss a refusal, as before - A squash refused at its tip exits 2, as it stays paused, where 1.10.0 exited 1
- A move its own resolution broke outright refuses with nothing applied, naming a rerun under
GIT_EDIT_NO_SELF_RESOLVE=1– 1.10.0 paused, offering a continue that refused again - Below git 2.50, a block the moved commit adds goes back out of a crossed stop by its content and lands, where it paused
- A bare
-s=autotakes your fixups that a split, reword or fold of yours gave a new subject or paths – and a fixup another caller rewords becomes theirs - A refusal for a resolution taking in a later commit's change names, for each loss, the stop holding it and one of its lines, as "an earlier stop's commit"
- The output grep the README documents keeps the lines above each match, where a refusal prints its remedy
New
--editsthat a target lacks offersgit edit <target>, its pause, to make the edit there by hand- A long reorder – past 12 commits – lists the moved commits beside the one each now follows, the stretches between them counted
- A move's pause lists the files staged clean that hold lines a moved commit still to come adds
- An emptied stop names the commit it builds on by its changed lines, not just its file
--commit's hook refusal names the worktree link, and says where--no-verifyleaves the repository's hooks running- The README shows how to share
edit.*settings through an included tracked file, and lists the move and reorder checks a verify runs at
Fixed since 1.10.0
What a run lands
- A move landed a crossed commit without its edit of other words in a line the moved commit rewrote – that edit now pauses rather than go with the moved commit
- A reorder after another session's rewrite was refused as unreachable – it now runs again on the new tip
- A bare
-s=autoskipped your own fixups once a split, reword or fold had reshaped them,--statuscalling them "made outside git-edit"
What it tells you
- A squash refused at its tip could name the wrong commit for its lost lines, reading only the first 5 files the result differed in
--statusnamed no owner for a pause that ended as it read it--statusnamed a checkout left behind after a reword, or a move or squash keeping the tip's tree – the--carryit offered found nothing to bring