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

build(deps): update all non-major dependencies #478

Merged
merged 1 commit into from
Jul 13, 2024

Conversation

aki-bot[bot]
Copy link
Contributor

@aki-bot aki-bot bot commented Jul 13, 2024

This PR contains the following updates:

Package Update Change
ghcr.io/renovatebot/renovate (source) patch 37.431 -> 37.431.4
jesseduffield/lazygit minor v0.42.0 -> v0.43.0

Release Notes

renovatebot/renovate (ghcr.io/renovatebot/renovate)

v37.431.4

Compare Source

Bug Fixes

v37.431.3

Compare Source

Miscellaneous Chores
Build System

v37.431.2

Compare Source

Build System

v37.431.1

Compare Source

Tests
Build System
jesseduffield/lazygit (jesseduffield/lazygit)

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 - "after 3:00 and before 6:00 on Saturday" (UTC), Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

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

👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.


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

This PR has been generated by Renovate Bot.

@aki-bot aki-bot bot requested a review from akikanellis as a code owner July 13, 2024 05:08
@aki-bot aki-bot bot enabled auto-merge (squash) July 13, 2024 05:08
akikanellis
akikanellis previously approved these changes Jul 13, 2024
@github-actions github-actions bot added the build Changes that affect the build system or external dependencies label Jul 13, 2024
@aki-bot aki-bot bot force-pushed the update-dependencies-all-minor-patch branch from 59620e0 to 502628f Compare July 13, 2024 05:23
akikanellis
akikanellis previously approved these changes Jul 13, 2024
@github-actions github-actions bot added build Changes that affect the build system or external dependencies and removed build Changes that affect the build system or external dependencies labels Jul 13, 2024
@aki-bot aki-bot bot changed the title build(deps): update ghcr.io/renovatebot/renovate docker tag to v37.431.1 build(deps): update ghcr.io/renovatebot/renovate docker tag to v37.431.2 Jul 13, 2024
@github-actions github-actions bot added build Changes that affect the build system or external dependencies and removed build Changes that affect the build system or external dependencies labels Jul 13, 2024
@aki-bot aki-bot bot force-pushed the update-dependencies-all-minor-patch branch from 502628f to 2b2a222 Compare July 13, 2024 05:49
akikanellis
akikanellis previously approved these changes Jul 13, 2024
@github-actions github-actions bot added build Changes that affect the build system or external dependencies and removed build Changes that affect the build system or external dependencies labels Jul 13, 2024
@aki-bot aki-bot bot changed the title build(deps): update ghcr.io/renovatebot/renovate docker tag to v37.431.2 build(deps): update all non-major dependencies Jul 13, 2024
@github-actions github-actions bot added build Changes that affect the build system or external dependencies and removed build Changes that affect the build system or external dependencies labels Jul 13, 2024
@aki-bot aki-bot bot force-pushed the update-dependencies-all-minor-patch branch from 2b2a222 to 0b59669 Compare July 13, 2024 07:50
@github-actions github-actions bot added build Changes that affect the build system or external dependencies and removed build Changes that affect the build system or external dependencies labels Jul 13, 2024
akikanellis
akikanellis previously approved these changes Jul 13, 2024
@github-actions github-actions bot added build Changes that affect the build system or external dependencies and removed build Changes that affect the build system or external dependencies labels Jul 13, 2024
@aki-bot aki-bot bot force-pushed the update-dependencies-all-minor-patch branch from 0b59669 to e595996 Compare July 13, 2024 08:24
@github-actions github-actions bot removed the build Changes that affect the build system or external dependencies label Jul 13, 2024
@github-actions github-actions bot added build Changes that affect the build system or external dependencies and removed build Changes that affect the build system or external dependencies labels Jul 13, 2024
@aki-bot aki-bot bot merged commit 49c1e62 into main Jul 13, 2024
18 checks passed
@aki-bot aki-bot bot deleted the update-dependencies-all-minor-patch branch July 13, 2024 08:59
akikanellis pushed a commit that referenced this pull request Jul 13, 2024
## [1.20.72](v1.20.71...v1.20.72) (2024-07-13)

### Build System

* **deps:** update all non-major dependencies ([#478](#478)) ([49c1e62](49c1e62))
@akikanellis
Copy link
Owner

🎉 This PR is included in version 1.20.72 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Changes that affect the build system or external dependencies released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant