diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2021-08-14 07:56:22 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2021-08-14 07:56:22 +0800 |
| commit | 117e2caa42210de5c2c1ecfdf5d2bda056cd6f00 (patch) | |
| tree | c742277e7f21ad2746a807e2c0318a0fae662f5f /diff.c | |
| parent | 18c9fced7bf3feb3b326c73e2901e2ad05824c29 (diff) | |
| parent | 5d213e46bb7b880238ff5ea3914e940a50ae9369 (diff) | |
| download | git-117e2caa42210de5c2c1ecfdf5d2bda056cd6f00.tar.xz | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git: (51 commits)
Git 2.33-rc2
object-file: use unsigned arithmetic with bit mask
Revert 'diff-merges: let "-m" imply "-p"'
object-store: avoid extra ';' from KHASH_INIT
oidtree: avoid nested struct oidtree_node
Git 2.33-rc1
test: fix for COLUMNS and bash 5
The eighth batch
diff: --pickaxe-all typofix
mingw: align symlinks-related rmdir() behavior with Linux
t7508: avoid non POSIX BRE
use fspathhash() everywhere
t0001: fix broken not-quite getcwd(3) test in bed67874e2
Documentation: render special characters correctly
reset: clear_unpack_trees_porcelain to plug leak
builtin/rebase: fix options.strategy memory lifecycle
builtin/merge: free found_ref when done
builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv
convert: release strbuf to avoid leak
read-cache: call diff_setup_done to avoid leak
...
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options) die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S")); if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK)) - die(_("---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S")); + die(_("--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S")); /* * Most of the time we can say "there are changes" |