Re: [PATCH v7 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree
From: Junio C Hamano <hidden>
Date: 2019-02-04 18:18:52
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2019-02-01 · Re: [PATCH v7 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree · Nickolai Belakovski <hidden>
- 2019-02-01 · Re: [PATCH v7 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree · Junio C Hamano <hidden>
- 2019-02-01 · [PATCH v7 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree · <hidden>
Nickolai Belakovski [off-list ref] writes:
On Fri, Feb 1, 2019 at 2:54 PM Junio C Hamano [off-list ref] wrote:quoted
I had to apply and then use --color-words to see what is going on. Please avoid unnecessary reflowing of the text that makes the patch harder than necessary to read.I was trying to keep the line length consistent. How else can I accomplish that?
By relying on the fact that in the final output it does not matter how the sources look like, e.g.
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index bf5316ffa9..b64b3bf458 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt@@ -27,7 +27,9 @@ DESCRIPTION If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted with an -asterisk. Option `-r` causes the remote-tracking branches to be listed, +asterisk and shown in green. Any branch checked out in linked worktrees +is shown in cyan and marked with a plus sign. Option `-r` causes the +remote-tracking branches to be listed, and option `-a` shows both local and remote branches. If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if