git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] builtin/blame: highlight recently changed lines

From
Stefan Beller <sbeller@google.com>
Date
Apr 17, 2018, 19:31 UTC
Message-ID
<CAGZ79kb+MEJswk9NU3ktr9gAY7XVdCYS-w=e-Qmmp8knSNsHTg@mail.gmail.com>
In-Reply-To
<xmqqbmeiv7c2.fsf@gitster-ct.c.googlers.com>
On Mon, Apr 16, 2018 at 8:29 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> It seems that this
>
> $ git -c color.blame.repeatedlines=cyan blame --heated-lines builtin/blame.c
>
> refuses to run.
>
> Would it work if the configuration is in .git/config instead, or
> would it forever disable --heated-lines once somebody choses to use
> --color-lines feature by default by configuring it in?

That is the unfortunate part of this series, I have not figured out how to treat these two options at the same time.

One could take the approach to check the config first and see if there are conflicts and then overlay it with the command line options (and resolve conflicts there, but CLI taking precedence over config).

Or we'd need to introduce another config blame.coloring={none, repeatedlines, highlightrecent} which breaks the tie.

Thanks, Stefan

Previous: Junio C HamanoNext: Stefan Beller
Message 8 of 18 in “blame: color line by commit”
  1. 0/2 blame: color line by commitStefan Beller, Apr 16, 2018
  2. 1/2 builtin/blame: dim uninteresting metadata linesStefan Beller, Apr 16, 2018
  3. Junio C HamanoApr 17, 2018
  4. Stefan BellerApr 17, 2018
  5. 2/2 builtin/blame: highlight recently changed linesStefan Beller, Apr 16, 2018
  6. Junio C HamanoApr 17, 2018
  7. Junio C HamanoApr 17, 2018
  8. Stefan BellerApr 17, 2018
  9. Stefan BellerApr 17, 2018
  10. 1/2 builtin/blame: dim uninteresting metadata linesStefan Beller, Apr 17, 2018
  11. 2/2 builtin/blame: highlight recently changed linesStefan Beller, Apr 17, 2018
  12. Eric SunshineApr 17, 2018
  13. Junio C HamanoApr 18, 2018
  14. René ScharfeJun 9, 2018
  15. Stefan BellerJun 11, 2018
  16. Junio C HamanoJun 14, 2018
  17. Junio C HamanoApr 18, 2018
  18. Junio C HamanoApr 18, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.