From 24e6e157997e8ab2dd4f500dbb85fdea634d2dc7 Mon Sep 17 00:00:00 2001 From: Tim Ebert Date: Mon, 3 Jun 2024 17:18:37 +0200 Subject: [PATCH] Update docs for external diff program --- README.md | 12 ++++++------ pkg/cmd/diff/diff.go | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 73f9334..afdbd74 100644 --- a/README.md +++ b/README.md @@ -88,13 +88,13 @@ comparing revisions 2 and 3 of deployment.apps/nginx The `k revisions diff` command uses `diff -u -N` to compare revisions by default. It also respects the `KUBECTL_EXTERNAL_DIFF` environment variable like the `kubectl diff` command. -To get a nicer diff view, you can use one of these: +To get a nicer diff output, you can use one of these: ```bash -# Add color to the diff output -k revisions diff deploy nginx | colordiff -# Specify an external diff programm -KUBECTL_EXTERNAL_DIFF="colordiff -u" k revisions diff deploy nginx +# Use a colored external diff program +export KUBECTL_EXTERNAL_DIFF="colordiff -u" +# Use dyff as a rich diff program +export KUBECTL_EXTERNAL_DIFF="dyff between --omit-header" # Show diff in VS Code -KUBECTL_EXTERNAL_DIFF="code --diff --wait" k revisions diff deploy nginx +export KUBECTL_EXTERNAL_DIFF="code --diff --wait" ``` diff --git a/pkg/cmd/diff/diff.go b/pkg/cmd/diff/diff.go index a59f925..c63151f 100644 --- a/pkg/cmd/diff/diff.go +++ b/pkg/cmd/diff/diff.go @@ -77,12 +77,12 @@ files as empty) options.`, # Compare the previous revision and the revision before that kubectl revisions diff deploy nginx --revision=-2 - # Add color to the diff output - kubectl revisions diff deploy nginx | colordiff - - # Specify an external diff programm + # Use a colored external diff program KUBECTL_EXTERNAL_DIFF="colordiff -u" kubectl revisions diff deploy nginx + # Use dyff as a rich diff program + KUBECTL_EXTERNAL_DIFF="dyff between --omit-header" kubectl revisions diff deploy nginx + # Show diff in VS Code KUBECTL_EXTERNAL_DIFF="code --diff --wait" kubectl revisions diff deploy nginx `,