diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 21:54:46 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 21:54:46 +0300 |
commit | f4c18e58be60d3f7cfec5da23f8d89526abce75a (patch) | |
tree | b5f7bd3b58989328947288cca1dd0085194b19a3 /diff.c | |
parent | 67e7305e64fea8d15879e9dc3831fc8e31cfe619 (diff) | |
parent | 0a868031edee0f7a38b42e13c8017d6cbbb4af1b (diff) |
Merge branch 'pb/complete-diff-options'
Completion updates.
* pb/complete-diff-options: (24 commits)
diff.c: mention completion above add_diff_options
completion: complete --remerge-diff
completion: complete --diff-merges, its options and --no-diff-merges
completion: move --pickaxe-{all,regex} to __git_diff_common_options
completion: complete --ws-error-highlight
completion: complete --unified
completion: complete --output-indicator-{context,new,old}
completion: complete --output
completion: complete --no-stat
completion: complete --no-relative
completion: complete --line-prefix
completion: complete --ita-invisible-in-index and --ita-visible-in-index
completion: complete --irreversible-delete
completion: complete --ignore-matching-lines
completion: complete --function-context
completion: complete --find-renames
completion: complete --find-object
completion: complete --find-copies
completion: complete --default-prefix
completion: complete --compact-summary
...
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -5520,6 +5520,10 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns return 0; } +/* + * Consider adding new flags to __git_diff_common_options + * in contrib/completion/git-completion.bash + */ struct option *add_diff_options(const struct option *opts, struct diff_options *options) { |