A script to detect merges that occlude (completely override) the changes to their parents
License
michielbuddingh/find-occluded
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
master
Could not load branches
Nothing to show
Could not load tags
Nothing to show
{{ refName }}
default
Code
-
Clone
Use Git or checkout with SVN using the web URL.
Work fast with our official CLI. Learn more.
- Open with GitHub Desktop
- Download ZIP
Launching GitHub Desktop
If nothing happens, download GitHub Desktop and try again.
Launching GitHub Desktop
If nothing happens, download GitHub Desktop and try again.
Launching Xcode
If nothing happens, download Xcode and try again.
Launching Visual Studio Code
Your codespace will open once ready.
There was a problem preparing your codespace, please try again.
find-occluded.sh [<commit>] [diffopts] traverses the ancestors of <commit> (presumed to be HEAD if omitted) to find commits that have been occluded by a merge. An occluded ancestor is essentially reverted, but does not show up in git logs very clearly. [diffopts] can be used to pass output options to git diff. Octopus merges will not be handled correctly. This script is very slow, and works its way back to the very first merge commit ancestor. On long, merge-intensive histories, expect it to take several minutes to complete. For a version that works with the msysgit distribution ~ 2013, which ships many severely outdated versions of the GNU tools, please check out the unmaintained win32 branch.
About
A script to detect merges that occlude (completely override) the changes to their parents
Resources
License
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published