Skip to content

Navigation Menu

Appearance settings

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.

Appearance settings

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

diffplug / spotless Public

Notifications You must be signed in to change notification settings
Fork 486
Star 5k

Code
Issues 220
Pull requests 24
Discussions
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Security
Insights

Base `ratchetFrom` on the merge base#631

Merged

nedtwigg merged 4 commits intomaindiffplug/spotless:mainfrom

feat/merge-parentdiffplug/spotless:feat/merge-parentCopy head branch name to clipboard

Jul 1, 2020

Conversation Commits4 (4)Checks Files changed

Merged

Base `ratchetFrom` on the merge base#631
nedtwigg merged 4 commits intomainfrom
feat/merge-parent

Commits

Commits on Jun 30, 2020

Bump JGit to latest 5.8.0, to use the new ReachabilityChecker.
nedtwigg
committed
First cut at a test to help illustrate the problem.
nedtwigg
committed
Use the first merge-base as the root tree, rather than naively using the original.
nedtwigg
committed
Update changelogs.
nedtwigg
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.