From e03bb929057bf36137ad85b2dff2611f30cf4433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <gaetan.lehmann@gmail.com>
Date: Wed, 8 Oct 2025 22:59:06 +0200
Subject: [PATCH 1/4] op log: -G as short version of --no-graph

To be consistent with `jj log -G`.
---
 cli/src/commands/operation/log.rs | 2 +-
 cli/tests/cli-reference@.md.snap  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/src/commands/operation/log.rs b/cli/src/commands/operation/log.rs
index 9b50d9df7c0..c20850547ac 100644
--- a/cli/src/commands/operation/log.rs
+++ b/cli/src/commands/operation/log.rs
@@ -57,7 +57,7 @@ pub struct OperationLogArgs {
     #[arg(long)]
     reversed: bool,
     /// Don't show the graph, show a flat list of operations
-    #[arg(long)]
+    #[arg(long, short = 'G')]
     no_graph: bool,
     /// Render each operation using the given template
     ///
diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap
index 7e93bde9dfa..efadbdb20b7 100644
--- a/cli/tests/cli-reference@.md.snap
+++ b/cli/tests/cli-reference@.md.snap
@@ -1958,7 +1958,7 @@ Like other commands, `jj op log` snapshots the current working-copy changes and
 
    Applied after operations are reordered topologically, but before being reversed.
 * `--reversed` — Show operations in the opposite order (older operations first)
-* `--no-graph` — Don't show the graph, show a flat list of operations
+* `-G`, `--no-graph` — Don't show the graph, show a flat list of operations
 * `-T`, `--template <TEMPLATE>` — Render each operation using the given template
 
    You can specify arbitrary template expressions using the [built-in keywords]. See [`jj help -k templates`] for more information.

From feb866d666bcadb2e76711d88c8764bc636b9e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <gaetan.lehmann@gmail.com>
Date: Thu, 9 Oct 2025 08:31:57 +0200
Subject: [PATCH 2/4] evolog: -G as short version of --no-graph

---
 cli/src/commands/evolog.rs       | 2 +-
 cli/tests/cli-reference@.md.snap | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/src/commands/evolog.rs b/cli/src/commands/evolog.rs
index 8fbf9dbb057..11e28792974 100644
--- a/cli/src/commands/evolog.rs
+++ b/cli/src/commands/evolog.rs
@@ -62,7 +62,7 @@ pub(crate) struct EvologArgs {
     #[arg(long)]
     reversed: bool,
     /// Don't show the graph, show a flat list of revisions
-    #[arg(long)]
+    #[arg(long, short = 'G')]
     no_graph: bool,
     /// Render each revision using the given template
     ///
diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap
index efadbdb20b7..960a10787ae 100644
--- a/cli/tests/cli-reference@.md.snap
+++ b/cli/tests/cli-reference@.md.snap
@@ -966,7 +966,7 @@ Lists the previous commits which a change has pointed to. The current commit of
 
    Applied after revisions are reordered topologically, but before being reversed.
 * `--reversed` — Show revisions in the opposite order (older revisions first)
-* `--no-graph` — Don't show the graph, show a flat list of revisions
+* `-G`, `--no-graph` — Don't show the graph, show a flat list of revisions
 * `-T`, `--template <TEMPLATE>` — Render each revision using the given template
 
    All 0-argument methods of the [`CommitEvolutionEntry` type] are available as keywords in the template expression. See [`jj help -k templates`] for more information.

From 07844c79de11d145d4d948f524f00ebf836aa779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <gaetan.lehmann@gmail.com>
Date: Thu, 9 Oct 2025 08:38:38 +0200
Subject: [PATCH 3/4] op show: -G as short version of --no-graph

---
 cli/src/commands/operation/show.rs |  2 +-
 cli/tests/cli-reference@.md.snap   |  2 +-
 cli/tests/test_operations.rs       | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cli/src/commands/operation/show.rs b/cli/src/commands/operation/show.rs
index f3b32fa0832..ce027131a89 100644
--- a/cli/src/commands/operation/show.rs
+++ b/cli/src/commands/operation/show.rs
@@ -35,7 +35,7 @@ pub struct OperationShowArgs {
     #[arg(default_value = "@", add = ArgValueCandidates::new(complete::operations))]
     operation: String,
     /// Don't show the graph, show a flat list of modified changes
-    #[arg(long)]
+    #[arg(long, short = 'G')]
     no_graph: bool,
     /// Render the operation using the given template
     ///
diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap
index 960a10787ae..8871a653e57 100644
--- a/cli/tests/cli-reference@.md.snap
+++ b/cli/tests/cli-reference@.md.snap
@@ -2067,7 +2067,7 @@ Show changes to the repository in an operation
 
 ###### **Options:**
 
-* `--no-graph` — Don't show the graph, show a flat list of modified changes
+* `-G`, `--no-graph` — Don't show the graph, show a flat list of modified changes
 * `-T`, `--template <TEMPLATE>` — Render the operation using the given template
 
    You can specify arbitrary template expressions using the [built-in keywords]. See [`jj help -k templates`] for more information.
diff --git a/cli/tests/test_operations.rs b/cli/tests/test_operations.rs
index ffc2e03d9ed..31c439b5d1a 100644
--- a/cli/tests/test_operations.rs
+++ b/cli/tests/test_operations.rs
@@ -2560,6 +2560,23 @@ fn test_op_show() {
     - tracked kulxwnxm e1a239a5 Commit 5
     [EOF]
     ");
+
+    // Showing a given operation, without graph
+    let output = work_dir.run_jj(["op", "show", "--no-graph", "8727dbd86fa3"]);
+    insta::assert_snapshot!(output, @r"
+    8727dbd86fa3 test-username@host.example.com 2001-02-03 04:05:27.000 +07:00 - 2001-02-03 04:05:27.000 +07:00
+    new empty commit
+    args: jj new bookmark-1@origin -m 'new commit'
+
+    Changed commits:
+    + tlkvzzqu 8f340dd7 (empty) new commit
+    - qpvuntsm hidden e8849ae1 (empty) (no description set)
+
+    Changed working copy default@:
+    + tlkvzzqu 8f340dd7 (empty) new commit
+    - qpvuntsm hidden e8849ae1 (empty) (no description set)
+    [EOF]
+    ");
 }
 
 #[test]

From 041e6fa87b407f89dfe36de4f1ed013581f82c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <gaetan.lehmann@gmail.com>
Date: Thu, 9 Oct 2025 08:55:11 +0200
Subject: [PATCH 4/4] op diff: -G as short version of --no-graph

---
 CHANGELOG.md                       |  3 ++-
 cli/src/commands/operation/diff.rs |  2 +-
 cli/tests/cli-reference@.md.snap   |  2 +-
 cli/tests/test_operations.rs       | 31 ++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd02acaa0a..c61d9fd6802 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * Templates now support a `.split(separator, [limit])` method on strings to
   split a string into a list of substrings.
 
-* `jj log -G` is now available as a short form of `jj log --no-graph`.
+* `-G` is now available as a short form of `--no-graph` in `jj log`, `jj evolog`,
+  `jj op log`, `jj op show` and `jj op diff`.
 
 * `jj metaedit` now accepts `-m`/`--message` option to non-interactively update
   the change description.
diff --git a/cli/src/commands/operation/diff.rs b/cli/src/commands/operation/diff.rs
index d191b5435f6..c299add6ef8 100644
--- a/cli/src/commands/operation/diff.rs
+++ b/cli/src/commands/operation/diff.rs
@@ -75,7 +75,7 @@ pub struct OperationDiffArgs {
     )]
     to: Option<String>,
     /// Don't show the graph, show a flat list of modified changes
-    #[arg(long)]
+    #[arg(long, short = 'G')]
     no_graph: bool,
     /// Show patch of modifications to changes
     ///
diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap
index 8871a653e57..9c2cf9f46c8 100644
--- a/cli/tests/cli-reference@.md.snap
+++ b/cli/tests/cli-reference@.md.snap
@@ -1921,7 +1921,7 @@ Compare changes to the repository between two operations
 * `--operation <OPERATION>` [alias: `op`] — Show repository changes in this operation, compared to its parent
 * `-f`, `--from <FROM>` — Show repository changes from this operation
 * `-t`, `--to <TO>` — Show repository changes to this operation
-* `--no-graph` — Don't show the graph, show a flat list of modified changes
+* `-G`, `--no-graph` — Don't show the graph, show a flat list of modified changes
 * `-p`, `--patch` — Show patch of modifications to changes
 
    If the previous version has different parents, it will be temporarily rebased to the parents of the new version, so the diff is not contaminated by unrelated changes.
diff --git a/cli/tests/test_operations.rs b/cli/tests/test_operations.rs
index 31c439b5d1a..541fc1ec94e 100644
--- a/cli/tests/test_operations.rs
+++ b/cli/tests/test_operations.rs
@@ -1778,6 +1778,37 @@ fn test_op_diff_sibling() {
     - qpvuntsm hidden b1ca67e2 (empty) B
     [EOF]
     ");
+
+    // no graph
+    let output = work_dir.run_jj([
+        "op",
+        "diff",
+        "--at-op",
+        p2_op_id,
+        "--from",
+        p2_op_id,
+        "--to",
+        p1_op_id,
+        "--summary",
+        "--no-graph",
+    ]);
+    insta::assert_snapshot!(output, @r"
+    From operation: 252ff3a5a0e6 (2001-02-03 08:05:12) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
+      To operation: 7bba3a63b73b (2001-02-03 08:05:11) new empty commit
+
+    Changed commits:
+    - qpvuntsm hidden b1ca67e2 (empty) B
+    + mzvwutvl 08c63613 (empty) A
+    + zsuskuln 47b9525e A.2
+    A file2
+    + kkmpptxz 6c70a4f7 A.1
+    A file1
+
+    Changed working copy default@:
+    + mzvwutvl 08c63613 (empty) A
+    - qpvuntsm hidden b1ca67e2 (empty) B
+    [EOF]
+    ");
 }
 
 #[test]