[v2,24/25] completion: complete --remerge-diff

Message ID	d5fc5b04b00c863a7201b6762f5034a89adc4577.1686574374.git.gitgitgadget@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@vger.kernel.org> Message-Id: <d5fc5b04b00c863a7201b6762f5034a89adc4577.1686574374.git.gitgitgadget@gmail.com> In-Reply-To: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com> References: <pull.1543.git.1686428484.gitgitgadget@gmail.com> <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com> Date: Mon, 12 Jun 2023 12:52:52 +0000 Subject: [PATCH v2 24/25] completion: complete --remerge-diff Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine <sunshine@sunshineco.com>, Philippe Blain <levraiphilippeblain@gmail.com>, Philippe Blain <levraiphilippeblain@gmail.com> Precedence: bulk From: Philippe Blain <levraiphilippeblain@gmail.com>
Series	completion: add missing diff options \| expand [v2,00/25] completion: add missing diff options [v2,01/25] completion: add comments describing __git_diff_* globals [v2,02/25] completion: complete --break-rewrites [v2,03/25] completion: complete --cc [v2,04/25] completion: complete --combined-all-paths [v2,05/25] completion: complete --compact-summary [v2,06/25] completion: complete --default-prefix [v2,07/25] completion: complete --find-copies [v2,08/25] completion: complete --find-object [v2,09/25] completion: complete --find-renames [v2,10/25] completion: complete --function-context [v2,11/25] completion: complete --ignore-matching-lines [v2,12/25] completion: complete --irreversible-delete [v2,13/25] completion: complete --ita-invisible-in-index and --ita-visible-in-index [v2,14/25] completion: complete --line-prefix [v2,15/25] completion: complete --no-relative [v2,16/25] completion: complete --no-stat [v2,17/25] completion: complete --output [v2,18/25] completion: complete --output-indicator-{context,new,old} [v2,19/25] completion: complete --patch-with-raw [v2,20/25] completion: complete --unified [v2,21/25] completion: complete --ws-error-highlight [v2,22/25] completion: move --pickaxe-{all,regex} to __git_diff_common_options [v2,23/25] completion: complete --diff-merges, its options and --no-diff-merges [v2,24/25] completion: complete --remerge-diff [v2,25/25] diff.c: mention completion above add_diff_options

Message ID

d5fc5b04b00c863a7201b6762f5034a89adc4577.1686574374.git.gitgitgadget@gmail.com (mailing list archive)

State

Superseded

Headers

Message-Id: 
 <d5fc5b04b00c863a7201b6762f5034a89adc4577.1686574374.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
References: <pull.1543.git.1686428484.gitgitgadget@gmail.com>
        <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
Date: Mon, 12 Jun 2023 12:52:52 +0000
Subject: [PATCH v2 24/25] completion: complete --remerge-diff
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
        Philippe Blain <levraiphilippeblain@gmail.com>,
        Philippe Blain <levraiphilippeblain@gmail.com>
Precedence: bulk
From: Philippe Blain <levraiphilippeblain@gmail.com>

Series

completion: add missing diff options | expand

Commit Message

Philippe Blain June 12, 2023, 12:52 p.m. UTC

From: Philippe Blain <levraiphilippeblain@gmail.com>

--remerge-diff only makes sense for 'git log' and 'git show', so add it
to __git_log_show_options which is referenced in the completion for
these two commands.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 7b7f3f838e0..38b6bac9154 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2042,7 +2042,7 @@  __git_log_shortlog_options="
 "
 # Options accepted by log and show
 __git_log_show_options="
-	--diff-merges --diff-merges= --no-diff-merges
+	--diff-merges --diff-merges= --no-diff-merges --remerge-diff
 "
 
 __git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r"

[v2,24/25] completion: complete --remerge-diff

Commit Message

Patch