diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-24 00:40:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-24 00:40:42 +0300 |
| commit | 5567960fd08748571d9f8d2f66462d127e33f130 (patch) | |
| tree | 34c06a8bc895ef200a06ef811da84d6e76a1fc71 | |
| parent | c9afca255d84ebe282a1d67e2a6c5b25e6f998a4 (diff) | |
| parent | 544ea7f37586ce619c5e14622ba73494661e9770 (diff) | |
Merge branch 'pb/complete-log-more' into jch
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
| -rw-r--r-- | contrib/completion/git-completion.bash | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6662db221d..c3408d4143 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1808,7 +1808,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --output= --output-indicator-context= --output-indicator-new= --output-indicator-old= --ws-error-highlight= - --pickaxe-all --pickaxe-regex + --pickaxe-all --pickaxe-regex --patch-with-raw " # Options for diff/difftool @@ -2072,6 +2072,16 @@ __git_log_common_options=" --min-age= --until= --before= --min-parents= --max-parents= --no-min-parents --no-max-parents + --alternate-refs --ancestry-path + --author-date-order --basic-regexp + --bisect --boundary --exclude-first-parent-only + --exclude-hidden --extended-regexp + --fixed-strings --grep-reflog + --ignore-missing --left-only --perl-regexp + --reflog --regexp-ignore-case --remove-empty + --right-only --show-linear-break + --show-notes-by-default --show-pulls + --since-as-filter --single-worktree " # Options that go well for log and gitk (not shortlog) __git_log_gitk_options=" @@ -2087,6 +2097,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" @@ -2170,6 +2181,8 @@ _git_log () --no-walk --no-walk= --do-walk --parents --children --expand-tabs --expand-tabs= --no-expand-tabs + --clear-decorations --decorate-refs= + --decorate-refs-exclude= $merge $__git_diff_common_options " |