From 0af2dedd96e973f4ed59af0cc325a70ca0b9100a Mon Sep 17 00:00:00 2001 From: David Symonds Date: Wed, 22 May 2019 13:34:30 +1000 Subject: [PATCH] Fix description of diff flags. Running `diff -u` produces a unified diff. It isn't related to Unicode. Also, `diff -N` treats _absent_ files as empty, not new files. --- staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go index f8f114a078b..9c679a0024a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go @@ -56,7 +56,7 @@ var ( KUBECTL_EXTERNAL_DIFF environment variable can be used to select your own diff command. By default, the "diff" command available in your path will be - run with "-u" (unicode) and "-N" (treat new files as empty) options.`)) + run with "-u" (unified diff) and "-N" (treat absent files as empty) options.`)) diffExample = templates.Examples(i18n.T(` # Diff resources included in pod.json. kubectl diff -f pod.json