diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-29 09:28:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-29 09:28:50 -0700 |
| commit | 393fa4b64b12da3d3fdcefb02739bb1e82291dcc (patch) | |
| tree | 37d9676a25f69b289f6d738642a43ae68d8b140e /parse-options.h | |
| parent | Merge branch 'ps/config-wo-the-repository' into next (diff) | |
| parent | add-patch: add diff.context command line overrides (diff) | |
| download | git-393fa4b64b12da3d3fdcefb02739bb1e82291dcc.tar.gz git-393fa4b64b12da3d3fdcefb02739bb1e82291dcc.zip | |
Merge branch 'lm/add-p-context' into next
"git add/etc -p" now honors diff.context configuration variable,
and learns to honor -U<n> option.
* lm/add-p-context:
add-patch: add diff.context command line overrides
add-patch: respect diff.context configuration
t: use test_config in t4055
t: use test_grep in t3701 and t4055
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 312045604d..706de9729f 100644 --- a/parse-options.h +++ b/parse-options.h @@ -623,6 +623,8 @@ int parse_opt_tracking_mode(const struct option *, const char *, int); #define OPT_PATHSPEC_FROM_FILE(v) OPT_FILENAME(0, "pathspec-from-file", v, N_("read pathspec from file")) #define OPT_PATHSPEC_FILE_NUL(v) OPT_BOOL(0, "pathspec-file-nul", v, N_("with --pathspec-from-file, pathspec elements are separated with NUL character")) #define OPT_AUTOSTASH(v) OPT_BOOL(0, "autostash", v, N_("automatically stash/stash pop before and after")) +#define OPT_DIFF_UNIFIED(v) OPT_INTEGER_F('U', "unified", v, N_("generate diffs with <n> lines context"), PARSE_OPT_NONEG) +#define OPT_DIFF_INTERHUNK_CONTEXT(v) OPT_INTEGER_F(0, "inter-hunk-context", v, N_("show context between diff hunks up to the specified number of lines"), PARSE_OPT_NONEG) #define OPT_IPVERSION(v) \ OPT_SET_INT_F('4', "ipv4", (v), N_("use IPv4 addresses only"), \ |