Skip to content

Commit 3c0b844

Browse files
committed
Merge branch 'pb/complete-log-more'
The completion script (in contrib/) learned more options that can be used with "git log". * pb/complete-log-more: completion: complete missing 'git log' options completion: complete --encoding completion: complete --patch-with-raw completion: complete missing rev-list options
2 parents bc7ee2e + 544ea7f commit 3c0b844

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

contrib/completion/git-completion.bash

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1808,7 +1808,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
18081808
--output= --output-indicator-context=
18091809
--output-indicator-new= --output-indicator-old=
18101810
--ws-error-highlight=
1811-
--pickaxe-all --pickaxe-regex
1811+
--pickaxe-all --pickaxe-regex --patch-with-raw
18121812
"
18131813

18141814
# Options for diff/difftool
@@ -2072,6 +2072,16 @@ __git_log_common_options="
20722072
--min-age= --until= --before=
20732073
--min-parents= --max-parents=
20742074
--no-min-parents --no-max-parents
2075+
--alternate-refs --ancestry-path
2076+
--author-date-order --basic-regexp
2077+
--bisect --boundary --exclude-first-parent-only
2078+
--exclude-hidden --extended-regexp
2079+
--fixed-strings --grep-reflog
2080+
--ignore-missing --left-only --perl-regexp
2081+
--reflog --regexp-ignore-case --remove-empty
2082+
--right-only --show-linear-break
2083+
--show-notes-by-default --show-pulls
2084+
--since-as-filter --single-worktree
20752085
"
20762086
# Options that go well for log and gitk (not shortlog)
20772087
__git_log_gitk_options="
@@ -2087,6 +2097,7 @@ __git_log_shortlog_options="
20872097
# Options accepted by log and show
20882098
__git_log_show_options="
20892099
--diff-merges --diff-merges= --no-diff-merges --dd --remerge-diff
2100+
--encoding=
20902101
"
20912102

20922103
__git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r"
@@ -2170,6 +2181,8 @@ _git_log ()
21702181
--no-walk --no-walk= --do-walk
21712182
--parents --children
21722183
--expand-tabs --expand-tabs= --no-expand-tabs
2184+
--clear-decorations --decorate-refs=
2185+
--decorate-refs-exclude=
21732186
$merge
21742187
$__git_diff_common_options
21752188
"

0 commit comments

Comments
 (0)