Skip to content

lazygit 0.43.0 #177213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 13, 2024
Merged

lazygit 0.43.0 #177213

merged 2 commits into from
Jul 13, 2024

Conversation

jesseduffield
Copy link
Contributor

action-homebrew-bump-formula


Created with brew bump-formula-pr.

release notes
## What's Changed

There's a few things in this release. I'm going to single out a couple that have changed my workflow.

Base branch stuff

lg-base-branch-demo.mov

Easier rebase onto base branch

(Add command to rebase onto base branch by @stefanhaller in jesseduffield/lazygit#3615)

When my feature branch gets out of date with the main branch, I like to rebase it onto the main branch. Up until now, that's required:

  • Navigating to the main branch
  • Pressing 'f' to fast-forward it onto its upstream branch
  • Pressing 'r' to rebase the checked-out branch onto the main branch

That takes too long! Now you can just press 'r' followed by 'b' to rebase onto the base branch (which defaults to origin/main).

See the divergence count from the base branch

(Divergence from base branch display by @stefanhaller in jesseduffield/lazygit#3613)

You can now also configure to see the divergence from a branch and its base branch with the following config:

gui:
    showDivergenceFromBaseBranch: arrowAndNumber # or 'onlyArrow'

This shows the divergence count in blue, next to the yellow count of divergence from the upstream branch. This is admittedly noisy, so it's an opt-in feature. But I think the noise is worth it.

If you set the config value to 'onlyArrow' it's a lot less noisy:

image

See detailed divergence from base branch

(Add command to show divergence from base branch as a left-right log by @stefanhaller in jesseduffield/lazygit#3614)

By pressing 'u' then 'b' on a branch you can see the divergence view for that branch compared to its base branch

Improved 'Find commit for fixup' feature

(Improve the "Find base commit for fixup" command by @stefanhaller in jesseduffield/lazygit#3602)

'Find commit for fixup' is not a very catchy name for this feature but I can't think of anything better at the moment. Nevertheless! The idea is that you often want to know for a given set of changes, which commit ought they be included in? Just press ctrl+f when in the files panel and lazygit will jump the cursor to the appropriate commit to fixup.

With this release, the feature is smarter and more lenient so it's more likely to find you a match. If you haven't tried this out you should really give it a go!

find-commit-demo.mov

Other Enhancements 🔥

similarity-demo.mov
image
lg-multi-author-select.mov

Fixes 🔧

Maintenance ⚙️

Docs 📖

New Contributors

Full Changelog: jesseduffield/lazygit@v0.42.0...v0.43.0

@github-actions github-actions bot added go Go use is a significant feature of the PR or issue bump-formula-pr PR was created using `brew bump-formula-pr` labels Jul 13, 2024
Copy link
Contributor

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Jul 13, 2024
@BrewTestBot BrewTestBot enabled auto-merge July 13, 2024 06:05
@BrewTestBot BrewTestBot added this pull request to the merge queue Jul 13, 2024
Merged via the queue into Homebrew:master with commit 18bcdd6 Jul 13, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bump-formula-pr PR was created using `brew bump-formula-pr` CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. go Go use is a significant feature of the PR or issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants