git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bagas Sanjaya <bagasdotme@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Stefan Beller <stefanbeller@gmail.com>,
	"Dr . Matthias St . Pierre" <m.st.pierre@ncp-e.com>,
	Bagas Sanjaya <bagasdotme@gmail.com>
Subject: [PATCH 0/2] blame: documentation update
Date: Fri,  8 Oct 2021 11:33:41 +0700	[thread overview]
Message-ID: <20211008043343.189651-1-bagasdotme@gmail.com> (raw)

Document the default output format for git-blame(1), as well as the
--color-* options which are currently undocumented but mentioned in
usage help.

Changes since v4 [1]:
  - Remove "(see section X)" pointer (suggested by Junio)

Bagas Sanjaya (2):
  blame: describe default output format
  blame: document --color-* options

 Documentation/blame-options.txt | 11 +++++++++++
 Documentation/config/color.txt  | 33 ++++++++++++++++++---------------
 Documentation/git-blame.txt     | 17 +++++++++++++++--
 3 files changed, 44 insertions(+), 17 deletions(-)

Range-diff against v4 [1]:
1:  976c17a485 = 1:  977c3dd77d blame: describe default output format
2:  517dc2cb3d ! 2:  df39496623 blame: document --color-* options
    @@ Documentation/blame-options.txt: take effect.
      	previously processed files.
      
     +--color-lines::
    -+	Color line annotations (see "The Default Format" section) differently if they
    -+	come from the same commit as the preceding line, and if neither `--porcelain`
    -+	nor `--incremental` format option is specified. This makes it easier to distinguish
    ++	Color line annotations, in the default format, differently if they come from
    ++	the same commit as the preceding line. This makes it easier to distinguish
     +	code blocks introduced by different commits. The color defaults to cyan and
     +	can be adjusted using the `color.blame.repeatedLines` config option.
     +
     +--color-by-age::
    -+	Color line annotations (see "The Default Format" section) depending on the age of
    -+	the line, if neither `--porcelain` nor `--incremental` format option is specified.
    ++	Color line annotations depending on the age of the line, in the default format.
     +	The `color.blame.highlightRecent` config option controls what color is used for
     +	each range of age.
     +

[1]:
https://lore.kernel.org/git/20211003105327.215996-3-bagasdotme@gmail.com/T/#u

base-commit: 106298f7f9cca4158a980de149ef217751e1f943
-- 
An old man doll... just what I always wanted! - Clara


             reply	other threads:[~2021-10-08  4:33 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-08  4:33 Bagas Sanjaya [this message]
2021-10-08  4:33 ` [PATCH 1/2] blame: describe default output format Bagas Sanjaya
2021-10-08  4:33 ` [PATCH 2/2] blame: document --color-* options Bagas Sanjaya

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211008043343.189651-1-bagasdotme@gmail.com \
    --to=bagasdotme@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=m.st.pierre@ncp-e.com \
    --cc=stefanbeller@gmail.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).