diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-13 14:13:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-13 14:13:40 -0700 |
| commit | 5707ac426d3ab3b2f8c4074b6af6f8a4646236ce (patch) | |
| tree | 205eb7276fd7072f7a231d78fb2d4b0109c6e7a0 | |
| parent | 0a41a89306b041fa27a8de2b2ffe15029351f542 (diff) | |
| parent | 11bc12ae1ecf78fe445c12e53455f981299d708d (diff) | |
| download | git-5707ac426d3ab3b2f8c4074b6af6f8a4646236ce.tar.gz | |
Merge branch 'rp/blame-first-parent-doc'
The "git blame --first-parent" option was not documented, but now
it is.
* rp/blame-first-parent-doc:
blame-options.txt: document --first-parent option
| -rw-r--r-- | Documentation/blame-options.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 5d122db6e9..88750af7ae 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -36,6 +36,12 @@ include::line-range-format.txt[] START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience. +--first-parent:: + Follow only the first parent commit upon seeing a merge + commit. This option can be used to determine when a line + was introduced to a particular integration branch, rather + than when it was introduced to the history overall. + -p:: --porcelain:: Show in a format designed for machine consumption. |