@@ -136,5 +136,13 @@ take effect. option. An empty file name, `""`, will clear the list of revs from previously processed files.+--color-lines::+ Color lines that contain repeated metadata. The color used is set with+ `color.blame.repeatedLines` config option.++--color-by-age::+ Color metadata depending on age of the line. `color.blame.highlightRecent`+ config option controls what color is used for each range of age.
Nowhere in "git blame --help" output we mention anything about
"metadata", so the readers of this new description will be left
puzzled what the word means in the context of this command.
We would need to pick words or phrases that readers can link easily
with the description of "THE PORCELAIN FORMAT" section.
Thanks.
Nowhere in "git blame --help" output we mention anything about
"metadata", so the readers of this new description will be left
puzzled what the word means in the context of this command.
We would need to pick words or phrases that readers can link easily
with the description of "THE PORCELAIN FORMAT" section.
In git-blame(1), we only describe output format for "THE PORCELAIN
FORMAT" as well as "INCREMENTAL OUTPUT", but not default format.
On the other hand, --color-* options only works on default format, not
the others.
--
An old man doll... just what I always wanted! - Clara
From: Dr. Matthias St. Pierre <hidden> Date: 2021-09-28 12:39:02
Thank you Bagas for adding the documentation. I think the only that disturbed Junio is the use of the word "metadata",
which is used internally, but not in the official documentation aimed at the git user.
Starting from your patch, I added some suggestions for alternative wordings.
Regards,
Matthias
commit ae2c59b7c76d9201d68aeb21b0ce57f2845732a1
Author: Bagas Sanjaya [off-list ref]
Date: Tue Sep 28 10:11:23 2021 +0200
blame: document --color-* options
Commit cdc2d5f11f1a (builtin/blame: dim uninteresting metadata lines,
2018-04-23) and 25d5f52901f0 (builtin/blame: highlight recently changed
lines, 2018-04-23) introduce --color-lines and --color-by-age options to
git blame, respectively. While both options are mentioned in usage help,
they aren't documented in git-blame(1). Document them.
Co-authored-by: Dr. Matthias St. Pierre [off-list ref]
@@ -136,5 +136,15 @@ take effect. option. An empty file name, `""`, will clear the list of revs from previously processed files.+--color-lines::+Color lines differently if they belong to the same commit as the preceding line.+This facilitates distinguishing code blocks introduced by different commits.+The color defaults to cyan and be adjusted using the `color.blame.repeatedLines`+config option.++--color-by-age::+Color lines depending on the age of the line. The `color.blame.highlightRecent`+config option controls what color is used for which range of age.+ -h:: Show help message.
@@ -9,8 +9,8 @@ color.advice.hint:: Use customized color for hints. color.blame.highlightRecent::-This can be used to color the metadata of a blame line depending-on age of the line.+Used to color line annotations differently depending on the age of the commit+(`git blame --color-by-age`). + This setting should be set to a comma-separated list of color and date settings, starting and ending with a color, the dates should be set from oldest to newest.
@@ -25,10 +25,9 @@ everything older than one year blue, recent changes between one month and one year old are kept white, and lines introduced within the last month are colored red.-color.blame.repeatedLines::-Use the customized color for the part of git-blame output that-is repeated meta information per line (such as commit id,-author name, date and timezone). Defaults to cyan.+color.blame.repeated+Use this color to colorize line annotations, if they belong to the same commit+as the preceding line (`git blame --color-lines`). Defaults to cyan. color.branch:: A boolean to enable/disable color in the output of
Dr. Matthias St. Pierre
Tech Lead Cryptography
matthias.st.pierre@ncp-e.com
Phone: +49 911 9968-0
www.ncp-e.com
Headquarters Germany: NCP engineering GmbH • Dombuehler Str. 2 • 90449 • Nuremberg
North American HQ: NCP engineering Inc. • 601 Cleveland Str., Suite 501-25 • Clearwater, FL 33755
Authorized representatives: Peter Soell, Patrick Oliver Graf, Beate Dietrich
Registry Court: Lower District Court of Nuremberg
Commercial register No.: HRB 7786 Nuremberg, VAT identification No.: DE 133557619
This e-mail message including any attachments is for the sole use of the intended recipient(s) and may contain privileged
or confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient,
please immediately contact the sender by reply e-mail and delete the original message and destroy all copies thereof.
-color.blame.repeatedLines::
-Use the customized color for the part of git-blame output that
-is repeated meta information per line (such as commit id,
-author name, date and timezone). Defaults to cyan.
+color.blame.repeated
+Use this color to colorize line annotations, if they belong to the same commit
+as the preceding line (`git blame --color-lines`). Defaults to cyan.
Why did you change the config name? I think you make mistake here: the
config name should stay as `color.blame.repeatedLines`.
--
An old man doll... just what I always wanted! - Clara
From: Dr. Matthias St. Pierre <hidden> Date: 2021-09-29 09:19:21
On 28/09/21 19.38, Dr. Matthias St. Pierre wrote:
quoted
-color.blame.repeatedLines::
-Use the customized color for the part of git-blame output that
-is repeated meta information per line (such as commit id,
-author name, date and timezone). Defaults to cyan.
+color.blame.repeated
+Use this color to colorize line annotations, if they belong to the same commit
+as the preceding line (`git blame --color-lines`). Defaults to cyan.
Why did you change the config name? I think you make mistake here: the
config name should stay as `color.blame.repeatedLines`.
Yes, you are right. That was not an intended change, the name was truncated accidentally.
Matthias
Dr. Matthias St. Pierre
Tech Lead Cryptography
matthias.st.pierre@ncp-e.com
Phone: +49 911 9968-0
www.ncp-e.com
Headquarters Germany: NCP engineering GmbH • Dombuehler Str. 2 • 90449 • Nuremberg
North American HQ: NCP engineering Inc. • 601 Cleveland Str., Suite 501-25 • Clearwater, FL 33755
Authorized representatives: Peter Soell, Patrick Oliver Graf, Beate Dietrich
Registry Court: Lower District Court of Nuremberg
Commercial register No.: HRB 7786 Nuremberg, VAT identification No.: DE 133557619
This e-mail message including any attachments is for the sole use of the intended recipient(s) and may contain privileged
or confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient,
please immediately contact the sender by reply e-mail and delete the original message and destroy all copies thereof.
Thank you Bagas for adding the documentation. I think the only that disturbed Junio is the use of the word "metadata",
which is used internally, but not in the official documentation aimed at the git user.
Starting from your patch, I added some suggestions for alternative wordings.
Regards,
Matthias
commit ae2c59b7c76d9201d68aeb21b0ce57f2845732a1
Author: Bagas Sanjaya [off-list ref]
Date: Tue Sep 28 10:11:23 2021 +0200
blame: document --color-* options
Commit cdc2d5f11f1a (builtin/blame: dim uninteresting metadata lines,
2018-04-23) and 25d5f52901f0 (builtin/blame: highlight recently changed
lines, 2018-04-23) introduce --color-lines and --color-by-age options to
git blame, respectively. While both options are mentioned in usage help,
they aren't documented in git-blame(1). Document them.
Co-authored-by: Dr. Matthias St. Pierre [off-list ref]
@@ -136,5 +136,15 @@ take effect. option. An empty file name, `""`, will clear the list of revs from previously processed files.+--color-lines::+Color lines differently if they belong to the same commit as the preceding line.+This facilitates distinguishing code blocks introduced by different commits.+The color defaults to cyan and be adjusted using the `color.blame.repeatedLines`+config option.++--color-by-age::+Color lines depending on the age of the line. The `color.blame.highlightRecent`+config option controls what color is used for which range of age.+ -h:: Show help message.
@@ -9,8 +9,8 @@ color.advice.hint:: Use customized color for hints. color.blame.highlightRecent::-This can be used to color the metadata of a blame line depending-on age of the line.+Used to color line annotations differently depending on the age of the commit+(`git blame --color-by-age`). + This setting should be set to a comma-separated list of color and date settings, starting and ending with a color, the dates should be set from oldest to newest.
@@ -25,10 +25,9 @@ everything older than one year blue, recent changes between one month and one year old are kept white, and lines introduced within the last month are colored red.-color.blame.repeatedLines::-Use the customized color for the part of git-blame output that-is repeated meta information per line (such as commit id,-author name, date and timezone). Defaults to cyan.+color.blame.repeated+Use this color to colorize line annotations, if they belong to the same commit+as the preceding line (`git blame --color-lines`). Defaults to cyan. color.branch:: A boolean to enable/disable color in the output of
I can't apply the suggestion patch above. You sent the patch with
S/MIME, right?
Next time, whether you post patches here, learn to use git format-patch
and git send-email. Send patches in plain text only, *no (S/)MIME, no
links, no compression, no attachments*.
Please resend your suggestion patch using git send-email, keeping in
mind the guidelines above.
--
An old man doll... just what I always wanted! - Clara
From: Dr. Matthias St. Pierre <hidden> Date: 2021-09-29 10:53:11
I can't apply the suggestion patch above. You sent the patch with
S/MIME, right?
Next time, whether you post patches here, learn to use git format-patch
and git send-email. Send patches in plain text only, *no (S/)MIME, no
links, no compression, no attachments*.
Please resend your suggestion patch using git send-email, keeping in
mind the guidelines above.
I'm sorry for the inconvenience: my company has a fancy-super-smart mail gateway
which adds stuff to the mail which is out of my control. For that reason, git send-email
currently doesn't work for me. So I kindly ask to pull the commit from my GitHub fork:
git fetch https://github.com/mspncp/git.git document-git-blame-color-options
git checkout -b document-git-blame-color-options
The truncated option name has already been corrected.
Matthias
Dr. Matthias St. Pierre
Tech Lead Cryptography
matthias.st.pierre@ncp-e.com
Phone: +49 911 9968-0
www.ncp-e.com
Headquarters Germany: NCP engineering GmbH • Dombuehler Str. 2 • 90449 • Nuremberg
North American HQ: NCP engineering Inc. • 601 Cleveland Str., Suite 501-25 • Clearwater, FL 33755
Authorized representatives: Peter Soell, Patrick Oliver Graf, Beate Dietrich
Registry Court: Lower District Court of Nuremberg
Commercial register No.: HRB 7786 Nuremberg, VAT identification No.: DE 133557619
This e-mail message including any attachments is for the sole use of the intended recipient(s) and may contain privileged
or confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient,
please immediately contact the sender by reply e-mail and delete the original message and destroy all copies thereof.
From: Dr. Matthias St. Pierre <hidden> Date: 2021-09-29 11:53:04
Sorry, I forgot 'FETCH_HEAD':
git fetch https://github.com/mspncp/git.git document-git-blame-color-options
git checkout -b document-git-blame-color-options FETCH_HEAD
Dr. Matthias St. Pierre
Tech Lead Cryptography
matthias.st.pierre@ncp-e.com
Phone: +49 911 9968-0
www.ncp-e.com
Headquarters Germany: NCP engineering GmbH • Dombuehler Str. 2 • 90449 • Nuremberg
North American HQ: NCP engineering Inc. • 601 Cleveland Str., Suite 501-25 • Clearwater, FL 33755
Authorized representatives: Peter Soell, Patrick Oliver Graf, Beate Dietrich
Registry Court: Lower District Court of Nuremberg
Commercial register No.: HRB 7786 Nuremberg, VAT identification No.: DE 133557619
This e-mail message including any attachments is for the sole use of the intended recipient(s) and may contain privileged
or confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient,
please immediately contact the sender by reply e-mail and delete the original message and destroy all copies thereof.