Stefan Sperling <stsp@stsp.name> wrote:
> On Sun, Jul 23, 2023 at 12:19:31AM +1000, Mark Jamsek wrote:
> >  tog: show work tree base commit marker in log view
> 
> Yes, I like this very much, thank you! ok by me.
> 
> Also ok by me for the got branch -l changes + tests.

Great, thanks!

> Should the tog documentation mention * and ~ somewhere? Your latest
> patch doesn't seem to update tog.1; maybe I missed an earlier change?

I considered it briefly but didn't act on it; however, it makes sense to
mention this. I've basically lifted the paragraph and list from the
got.1 branch -l docs and inserted it into tog.1's log entry:

(diff applies on the previous and also includes your change to the
got branch -l docs)


diff /home/mark/src/got
commit - 4707484ee92b48f003356aecbb0bc54d8fa633e5
path + /home/mark/src/got
blob - 5e1347b72fca7ac6b0261149e5998fe869d6aa49
file + got/got.1
--- got/got.1
+++ got/got.1
@@ -1566,7 +1566,8 @@ with one of the following annotations:
 If invoked in a work tree, the work tree's current branch is shown
 with one of the following annotations:
 .Bl -column YXZ description
-.It * Ta work tree's base commit and file index matches the branch tip
+.It * Ta work tree's base commit and the base commit of all tracked files
+matches the branch tip
 .It \(a~ Ta work tree comprises mixed commits or its base commit is out-of-date
 .El
 .It Fl n
blob - 816fab05d74cd0ab51f96eb3cad17d26d95b56e3
file + tog/tog.1
--- tog/tog.1
+++ tog/tog.1
@@ -147,6 +147,14 @@ This command is also executed if no explicit command i
 and the work tree's path prefix is implicitly prepended.
 Otherwise, the path is interpreted relative to the repository root.
 .Pp
+If invoked in a work tree, the log entry of the work tree's base commit will
+be prefixed with one of the following annotations:
+.Bl -column YXZ description
+.It * Ta work tree's base commit and the base commit of all tracked files
+matches the branch tip
+.It \(a~ Ta work tree comprises mixed commits or its base commit is out-of-date
+.El
+.Pp
 This command is also executed if no explicit command is specified.
 .Pp
 The key bindings for


-- 
Mark Jamsek <https://bsdbox.org>
GPG: F2FF 13DE 6A06 C471 CA80  E6E2 2930 DC66 86EE CF68