Skip to content
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

chore(deps): update dependency jesseduffield/lazygit to v0.43.1 #229

Merged
merged 1 commit into from
Jul 13, 2024

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Jul 13, 2024

Mend Renovate

This PR contains the following updates:

Package Update Change
jesseduffield/lazygit minor v0.42.0 -> v0.43.1

Release Notes

jesseduffield/lazygit (jesseduffield/lazygit)

v0.43.1

Compare Source

What's Changed

Fixes 🔧

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

v0.43.0

Compare Source

What's Changed

Thanks to all contributors who helped make this release happen! There's a lot of first-time contributors on this release as well so kudos to you all.

There's quite 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 https://github.com/jesseduffield/lazygit/pull/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 https://github.com/jesseduffield/lazygit/pull/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 https://github.com/jesseduffield/lazygit/pull/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 https://github.com/jesseduffield/lazygit/pull/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

Shameless Plug

I (Jesse) quit my day job and co-founded Subble, a startup that helps your company manage its SaaS subscriptions (discovery of subscriptions, onboarding/offboarding etc) to save you time and money. Check it out! https://www.subble.com/


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot enabled auto-merge (squash) July 13, 2024 07:11
@renovate renovate bot force-pushed the renovate/jesseduffield-lazygit-0.x branch from cd6a8f3 to 4c6fa96 Compare July 13, 2024 11:17
@renovate renovate bot changed the title chore(deps): update dependency jesseduffield/lazygit to v0.43.0 chore(deps): update dependency jesseduffield/lazygit to v0.43.1 Jul 13, 2024
@renovate renovate bot merged commit a1ca635 into main Jul 13, 2024
@renovate renovate bot deleted the renovate/jesseduffield-lazygit-0.x branch July 13, 2024 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant