news
Git 2.56 Adds New Options for Cleaning Up Branches and Resolving Conflicts
Coming three after Git 2.55, the Git 2.56 release introduces a new --resolved option to the git add command to stage conflict-resolved paths while leaving unrelated local changes unstaged. It scans the unmerged paths for leftover conflict markers and aborts if any are found.
Git 2.56 also teaches the git bisect command a --reset-when-found option that automatically runs git bisect reset to jump back to the original state or to the found culprit. The git branch command got a --delete-merged option to remove local branches that are already merged into their tracked remote-tracking branches, and git branch -d now reports when a branch can’t be deleted because it’s being used in an active bisect run.
Update
More in LWN:
-
Git v2.56.0 released
Version 2.56 of the Git distributed version-control system has been released. It has 748 non-merge commits since Git 2.55 was released back in June; those commits came from 104 developers, 39 of whom are first-time contributors. New features include a safer workflow for conflict resolution, smaller path-walk repacks, a new git history drop sub-command, and much more. LWN looked at Git 2.56 recently and the Microsoft's proprietary prison GitHub blog has a lengthy look at 2.56 as well.