Linux command
combinediff 命令
文本
复制后可按需替换文件名、目录或参数。
常用示例
Combine two patches
combinediff [patch1.diff] [patch2.diff]
Combine with custom context
combinediff -U [5] [patch1.diff] [patch2.diff]
Strip path components
combinediff -p [1] [patch1.diff] [patch2.diff]
Ignore whitespace changes
combinediff -w [patch1.diff] [patch2.diff]
Decompress gzipped patches
combinediff -z [patch1.diff.gz] [patch2.diff.gz]
说明
combinediff creates a unified diff expressing the sum of two diffs. The second patch must be relative to files after the first patch was applied. Part of patchutils package.
参数
- -p _n_, --strip-match _n_
- Ignore first n path components when comparing filenames
- -U _n_, --unified _n_
- Display n lines of context
- -d _pat_, --drop-context _pat_
- No context for files matching pattern
- -q, --quiet
- Suppress output
- -i, --ignore-case
- Case-insensitive comparison
- -w, --ignore-all-space
- Ignore whitespace changes
- -b, --ignore-space-change
- Ignore changes in whitespace amount
- -B, --ignore-blank-lines
- Ignore blank line changes
- -z, --decompress
- Decompress .gz and .bz2 files
- --interpolate
- Run as interdiff instead
- --help
- Display help
- --version
- Show version
FAQ
What is the combinediff command used for?
combinediff creates a unified diff expressing the sum of two diffs. The second patch must be relative to files after the first patch was applied. Part of patchutils package.
How do I run a basic combinediff example?
Run `combinediff [patch1.diff] [patch2.diff]` in a terminal, then adjust file names, paths, flags, or remote targets for your system.
What does -p _n_, --strip-match _n_ do in combinediff?
Ignore first n path components when comparing filenames