v0.3.7
To install or update git-branchless
, run the following:
$ cargo install git-branchless
$ git branchless init # in your repository
Release highlights
- Fixed a panic in
git move
. - Move/restack operations now require you to specify
--merge
in order to start merge conflict resolution. - You can configure colorization using the
--color
option orCLICOLOR
/NOCOLOR
environment variables (@bcongdon). - The
init.defaultBranch
Git config setting is respected when runninggit branchless init
(@bcongdon).
Thanks to @bcongdon for several contributions this release, and thanks to everyone else who provided valuable feedback in the Discussions!
Changelog
Added
git branchless init
takes a--main-branch
option to specify the name of the main branch without interactive prompting.- The
--color=[auto,always,never]
flag can be used to override the automatically detected value for terminal colors. - The
CLICOLOR
andNOCOLOR
environment variables are now respected.
Changed
- BREAKING: If your local main branch has an upstream branch, then that upstream branch will be treated as the repository's main branch, and your local main will be treated as a branch like any other. This should make workflows which commit to the main branch more ergonomic.
- BREAKING:
git move
andgit restack
will no longer perform merge conflict resolution unless the--merge
option was passed. git branchless init
will useinit.defaultBranch
when detecting the name of the main branch, if one is not provided by--main-branch
.- (#144) When automatic garbage collection is run, the number of deleted references is displayed.
Fixed
- On-disk rebases on systems with
/tmp
residing on a different filesystem should no longer fail. - (#129)
git move
operations with--dest
referring to a remote commit no longer panic.