Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-14 00:13:40 +0300
committerJunio C Hamano <gitster@pobox.com>2020-08-14 00:13:40 +0300
commit5707ac426d3ab3b2f8c4074b6af6f8a4646236ce (patch)
tree205eb7276fd7072f7a231d78fb2d4b0109c6e7a0 /Documentation
parent0a41a89306b041fa27a8de2b2ffe15029351f542 (diff)
parent11bc12ae1ecf78fe445c12e53455f981299d708d (diff)
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/blame-options.txt6
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.