Add a new --remerge-diff-only capability to show & log #1151
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
== Overview ==
Add a new flag --remerge-diff-only which is very similar to the recently added --remerge-diff, which allows people to find cherry-picks/reverts with suboptimal resolutions or additional changes inserted.
--remerge-diff-only behaves the same as --remerge-diff for merge commits. For non-merge commits, it attempt to detect if the commit is a cherry-pick (currently can only be done if the user used -x when creating it) or a revert (which have the "This is a revert of " message). After detection:
== Examples ==
You can see this in action on the linux.git repository with the following command:
$ git log --no-walk --remerge-diff-only 219d54332a09 a0184d71163a 2f216a850715
which provides a demonstration of each of the three non-merge-commit cases: not-a-pick-or-revert, a revert, and a cherry-pick.