|
2 | 2 | .\" Title: git-blame |
3 | 3 | .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] |
4 | 4 | .\" Generator: DocBook XSL Stylesheets v1.79.2 <http://docbook.sf.net/> |
5 | | -.\" Date: 2025-11-24 |
| 5 | +.\" Date: 2025-11-26 |
6 | 6 | .\" Manual: Git Manual |
7 | | -.\" Source: Git 2.52.0.84.g6ab38b7e9c |
| 7 | +.\" Source: Git 2.52.0.120.gb31ab939fe |
8 | 8 | .\" Language: English |
9 | 9 | .\" |
10 | | -.TH "GIT\-BLAME" "1" "2025-11-24" "Git 2\&.52\&.0\&.84\&.g6ab38b7" "Git Manual" |
| 10 | +.TH "GIT\-BLAME" "1" "2025-11-26" "Git 2\&.52\&.0\&.120\&.gb31ab9" "Git Manual" |
11 | 11 | .\" ----------------------------------------------------------------- |
12 | 12 | .\" * Define some portability stuff |
13 | 13 | .\" ----------------------------------------------------------------- |
@@ -379,6 +379,37 @@ config option\&. |
379 | 379 | Ignore whitespace when comparing the parent\(cqs version and the child\(cqs to find where the lines came from\&. |
380 | 380 | .RE |
381 | 381 | .PP |
| 382 | +\fB\-\-diff\-algorithm=\fR(\fBpatience\fR|\fBminimal\fR|\fBhistogram\fR|\fBmyers\fR) |
| 383 | +.RS4 |
| 384 | +Choose a diff algorithm\&. The variants are as follows: |
| 385 | +.PP |
| 386 | +\fBdefault\fR, \fBmyers\fR |
| 387 | +.RS4 |
| 388 | +The basic greedy diff algorithm\&. Currently, this is the default\&. |
| 389 | +.RE |
| 390 | +.PP |
| 391 | +\fBminimal\fR |
| 392 | +.RS4 |
| 393 | +Spend extra time to make sure the smallest possible diff is produced\&. |
| 394 | +.RE |
| 395 | +.PP |
| 396 | +\fBpatience\fR |
| 397 | +.RS4 |
| 398 | +Use "patience diff" algorithm when generating patches\&. |
| 399 | +.RE |
| 400 | +.PP |
| 401 | +\fBhistogram\fR |
| 402 | +.RS4 |
| 403 | +This algorithm extends the patience algorithm to "support low\-occurrence common elements"\&. |
| 404 | +.RE |
| 405 | +.sp |
| 406 | +For instance, if you configured the |
| 407 | +\fBdiff\&.algorithm\fR |
| 408 | +variable to a non\-default value and want to use the default one, then you have to use |
| 409 | +\fB\-\-diff\-algorithm=default\fR |
| 410 | +option\&. |
| 411 | +.RE |
| 412 | +.PP |
382 | 413 | \-\-abbrev=<n> |
383 | 414 | .RS4 |
384 | 415 | Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <m>+1 digits, where <m> is at least <n> but ensures the commit object names are unique\&. Note that 1 column is used for a caret to mark the boundary commit\&. |
|
0 commit comments