Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
A script to detect merges that occlude (completely override) the changes to their parents
Fetching latest commit…
Cannot retrieve the latest commit at this time.
|Failed to load latest commit information.|
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.