diff options
Diffstat (limited to 'third_party/git/Documentation/git-range-diff.txt')
| -rw-r--r-- | third_party/git/Documentation/git-range-diff.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/third_party/git/Documentation/git-range-diff.txt b/third_party/git/Documentation/git-range-diff.txt index 9701c1e5fd..8a6ea2c6c5 100644 --- a/third_party/git/Documentation/git-range-diff.txt +++ b/third_party/git/Documentation/git-range-diff.txt @@ -57,10 +57,6 @@ to revert to color all lines according to the outer diff markers See the ``Algorithm`` section below for an explanation why this is needed. ---[no-]notes[=<ref>]:: - This flag is passed to the `git log` program - (see linkgit:git-log[1]) that generates the patches. - <range1> <range2>:: Compare the commits specified by the two ranges, where `<range1>` is considered an older version of `<range2>`. @@ -79,7 +75,7 @@ to revert to color all lines according to the outer diff markers linkgit:git-diff[1]), most notably the `--color=[<when>]` and `--no-color` options. These options are used when generating the "diff between patches", i.e. to compare the author, commit message and diff of -corresponding old/new commits. There is currently no means to tweak most of the +corresponding old/new commits. There is currently no means to tweak the diff options passed to `git log` when generating those patches. OUTPUT STABILITY @@ -246,7 +242,7 @@ corresponding. The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time -needed to compute the least-cost assignment between n and m diffs. Git +needed to compute the least-cost assigment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this: |