aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/completion
diff options
context:
space:
mode:
authorPhilippe Blain <levraiphilippeblain@gmail.com>2024-01-21 04:07:50 +0000
committerJunio C Hamano <gitster@pobox.com>2024-01-22 08:09:53 -0800
commit6d1bfcdd2a14ac8e04fa269bbadbb3688e52a3a6 (patch)
tree35d30efabf1cac06999db52e9f71f56e5542a592 /contrib/completion
parent2e419b0578aec45ba332a5d260442c409f73091d (diff)
downloadgit-6d1bfcdd2a14ac8e04fa269bbadbb3688e52a3a6.tar.gz
completion: complete --encoding
The option --encoding is supported by 'git log' and 'git show', so add it to __git_log_show_options. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ccb17f4ad7..a7ae2cbe55 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2096,6 +2096,7 @@ __git_log_shortlog_options="
# Options accepted by log and show
__git_log_show_options="
--diff-merges --diff-merges= --no-diff-merges --dd --remerge-diff
+ --encoding=
"
__git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r"