diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 13:56:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 13:56:37 -0700 |
| commit | 755fb09163ec71b784b1bd9db5cb73de7a01d078 (patch) | |
| tree | c163b5e33e21a4151495361f6be975d7a3477dce /contrib/completion/git-completion.bash | |
| parent | f32af12ceec1c19d8a8a7874523d3a7ceef6eebf (diff) | |
| parent | 7c446ac7903555356d66e24dca5e370f0e1158bc (diff) | |
| download | git-755fb09163ec71b784b1bd9db5cb73de7a01d078.tar.gz | |
Merge branch 'so/diff-merges-dd'
"git log" and friends learned "--dd" that is a short-hand for
"--diff-merges=first-parent -p".
* so/diff-merges-dd:
completion: complete '--dd'
diff-merges: introduce '--dd' option
diff-merges: improve --diff-merges documentation
Diffstat (limited to 'contrib/completion/git-completion.bash')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 477ef8157a..13a39ebd2e 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2053,7 +2053,7 @@ __git_log_shortlog_options=" " # Options accepted by log and show __git_log_show_options=" - --diff-merges --diff-merges= --no-diff-merges --remerge-diff + --diff-merges --diff-merges= --no-diff-merges --dd --remerge-diff " __git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r" |