From a6206d46c84de1ec95990162c748c7d6882dea8e Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:32:10 -0800
Subject: [PATCH] docs: emphasize and clarify log revsets relevant to people
 coming from git

I couldn't come up with a Git analogue of `jj log`, but I think it's OK
leaving it as a TODO makes the point. Perhaps somebody can figure it
out.

Also, all the correspondences are not completely precise, so I didn't
emphasize it every single time.
---
 docs/git-comparison.md | 15 ++++++++++-----
 docs/revsets.md        | 12 ++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/docs/git-comparison.md b/docs/git-comparison.md
index 1f8e9ce037f..d15947dc5e6 100644
--- a/docs/git-comparison.md
+++ b/docs/git-comparison.md
@@ -181,14 +181,19 @@ parent.
       <td><code>git commit -a</code></td>
     </tr>
     <tr>
-      <td>See log of commits</td>
-      <td><code>jj log</code></td>
+      <td>See log of ancestors of the commit</td>
+      <td><code>jj log -r ::@</code></td>
       <td><code>git log --oneline --graph --decorate</code></td>
     </tr>
     <tr>
-      <td>Show log of ancestors of the current commit only, including all ancestors, not just stopping at immutable commits</td>
-      <td><code>jj log -r ::@</code></td>
-      <td><code>git log</code></td>
+      <td>See log of all reachable commits</td>
+      <td><code>jj log -r 'all()'</code> or <code>jj log -r ::</code></td>
+      <td><code>git log --oneline --graph --decorate --branches</code></td>
+    </tr>
+    <tr>
+      <td>Show log of commits not on the main branch</td>
+      <td><code>jj log</code></td>
+      <td>(TODO)</td>
     </tr>
     <tr>
       <td>Search among files versioned in the repository</td>
diff --git a/docs/revsets.md b/docs/revsets.md
index d3f829128e9..db8e0dd546a 100644
--- a/docs/revsets.md
+++ b/docs/revsets.md
@@ -227,22 +227,22 @@ Show the parent(s) of the working-copy commit (like `git log -1 HEAD`):
 jj log -r @-
 ```
 
-Show commits not on any remote branch:
+Show all ancestors of the working copy (like plain `git log`)
 
 ```
-jj log -r 'remote_branches()..'
+jj log -r ::@
 ```
 
-Show commits not on `origin` (if you have other remotes like `fork`):
+Show commits not on any remote branch:
 
 ```
-jj log -r 'remote_branches(remote=origin)..'
+jj log -r 'remote_branches()..'
 ```
 
-Show all ancestors of the working copy (almost like plain `git log`)
+Show commits not on `origin` (if you have other remotes like `fork`):
 
 ```
-jj log -r ::@
+jj log -r 'remote_branches(remote=origin)..'
 ```
 
 Show the initial commits in the repo (the ones Git calls "root commits"):