Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support diff merges option in range diff #1734

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support diff merges option in range diff #1734

wants to merge 1 commit into from

Commits on Nov 8, 2024

  1. range-diff: optionally include merge commits' diffs in the analysis 

    The `git log` command already offers support for including diffs for
merges, via the `--diff-merges=<format>` option.

Let's add corresponding support for `git range-diff`, too. This makes it
more convenient to spot differences between iterations of non-linear
contributions, where so-called "evil merges" are sometimes necessary and
need to be reviewed, too.

In my code reviews, I found the `--diff-merges=first-parent` option
particularly useful.

Signed-off-by: Johannes Schindelin <[email protected]>
    @dscho
    dscho committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    d01a395 View commit details
    Browse the repository at this point in the history