From: Sergey Organov Date: Wed, 04 Oct 2023 22:13:21 GMT Subject: Re: [PATCH v3 1/3] diff-merges: improve --diff-merges documentation Message-ID: <87r0madoji.fsf@osv.gnss.ru> In-Reply-To: Eric Sunshine writes: > On Wed, Oct 4, 2023 at 5:51 PM Sergey Organov wrote: >> * Put descriptions of convenience shortcuts first, so they are the >> first things reader observes rather than lengthy detailed stuff. >> >> * Get rid of very long line containing all the --diff-merges formats >> by replacing them with , and putting each supported format >> on its own line. >> >> Signed-off-by: Sergey Organov >> --- >> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt >> @@ -43,66 +43,74 @@ endif::git-diff[] >> +-m:: >> + Show diffs for merge commits in the default format. This is >> + similar to '--diff-merges=on' (which see) except `-m` will >> + produce no output unless `-p` is given as well. > > I'm having difficulty grasping the parenthetical "(which see)" comment. I believe it's translated full form of q.v., see: https://en.wikipedia.org/wiki/List_of_Latin_abbreviations "q.v. quod vide "which see" Imperative, used after a term or phrase that should be looked up elsewhere in the current document or book." HTH, -- Sergey Organov