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 /Documentation/git-reset.adoc | |
| 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 'Documentation/git-reset.adoc')
| -rw-r--r-- | Documentation/git-reset.adoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-reset.adoc b/Documentation/git-reset.adoc index 53ab88c545..50e8a0ba6f 100644 --- a/Documentation/git-reset.adoc +++ b/Documentation/git-reset.adoc @@ -125,6 +125,8 @@ OPTIONS separated with _NUL_ character and all other characters are taken literally (including newlines and quotes). +include::diff-context-options.adoc[] + `--`:: Do not interpret any more arguments as options. |