Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Sign up

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

jesseduffield / lazygit Public

Notifications You must be signed in to change notification settings
Fork 2k
Star 59.6k

Code
Issues 679
Pull requests 63
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

Continue/abort a conflicted cherry-pick or revert#4441

Merged

stefanhaller merged 13 commits intomasterjesseduffield/lazygit:masterfrom

continue-and-abort-for-revert-and-cherrypickjesseduffield/lazygit:continue-and-abort-for-revert-and-cherrypickCopy head branch name to clipboard

Apr 20, 2025

Conversation Commits13 (13)Checks Files changed

Commits

Commits on Apr 20, 2025

Don't wait for debugger in daemon mode
stefanhaller
committed
Remove rebaseMode field from TestGetCommits scenario
stefanhaller
committed
Use WorkingTreeState instead of RebaseMode in CommitLoader
stefanhaller
committed
Simplify the RebaseMode enum
stefanhaller
committed
Rename RebaseMode to WorkingTreeState
stefanhaller
committed
Centralize logic regarding WorkingTreeState close to its definition
stefanhaller
committed
Add test for a special situation in rebases involving empty commits
stefanhaller
committed
Move types/enums/enums.go to working_tree_state.go
stefanhaller
committed
Make WorkingTreeState a struct, and add cherry-picking and reverting states
stefanhaller
committed
Mention which command is continued in PromptToContinueRebase
stefanhaller
committed
Add test for reverting a commit that conflicts
stefanhaller
committed
Check for conflicts after reverting a commit
stefanhaller
committed
Add DisabledReason for rebase options when not rebasing or merging
stefanhaller
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.