diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-17 10:44:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-17 10:44:42 -0700 |
| commit | 2024ab3d97c482809cdc50e6adcc35750cd3bda0 (patch) | |
| tree | 49894980f3d53a331ba24fdfa88b2cf2e3f6c212 /builtin | |
| parent | Merge branch 'ly/fetch-pack-leakfix' (diff) | |
| parent | diff --no-index: support limiting by pathspec (diff) | |
| download | git-2024ab3d97c482809cdc50e6adcc35750cd3bda0.tar.gz git-2024ab3d97c482809cdc50e6adcc35750cd3bda0.zip | |
Merge branch 'jk/diff-no-index-with-pathspec'
"git diff --no-index dirA dirB" can limit the comparison with
pathspec at the end of the command line, just like normal "git
diff".
* jk/diff-no-index-with-pathspec:
diff --no-index: support limiting by pathspec
pathspec: add flag to indicate operation without repository
pathspec: add match_leading_pathspec variant
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index fa963808c3..c6231edce4 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -35,7 +35,7 @@ static const char builtin_diff_usage[] = " or: git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n" " or: git diff [<options>] <commit>...<commit> [--] [<path>...]\n" " or: git diff [<options>] <blob> <blob>\n" -" or: git diff [<options>] --no-index [--] <path> <path>" +" or: git diff [<options>] --no-index [--] <path> <path> [<pathspec>...]" "\n" COMMON_DIFF_OPTIONS_HELP; |