mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-01-26 11:33:59 +00:00
35 lines
1.1 KiB
Plaintext
35 lines
1.1 KiB
Plaintext
---
|
|
syntax: markdown
|
|
tags: [tldr, common]
|
|
source: https://github.com/tldr-pages/tldr.git
|
|
---
|
|
# wiggle
|
|
|
|
> A patch application tool resolving conflicts in patches that `patch` cannot handle.
|
|
> Note: Wiggle forcefully applies all changes, merging when conflicts arise, and reporting unresolvable issues.
|
|
> More information: <https://manned.org/wiggle>.
|
|
|
|
- Apply changes from the patch file to the original file:
|
|
|
|
`wiggle {{path/to/file.patch}}`
|
|
|
|
- Apply changes to the output file:
|
|
|
|
`wiggle {{path/to/file.patch}} {{[-o|--output]}} {{path/to/output_file.txt}}`
|
|
|
|
- Take any changes in `file.rej` that could not have been applied and merge them into a file:
|
|
|
|
`wiggle {{[-r|--replace]}} {{path/to/file}} {{path/to/file.rej}}`
|
|
|
|
- Extract one branch of a patch or merge file:
|
|
|
|
`wiggle {{[-x|--extract]}} {{path/to/file.patch}}`
|
|
|
|
- Apply a patch and save the compared words to the output file:
|
|
|
|
`wiggle {{[-w|--words]}} {{path/to/my_word_patch.patch}} {{[-o|--output]}} {{path/to/word_patched_code.c}}`
|
|
|
|
- Display help about the merge function:
|
|
|
|
`wiggle {{[-m|--merge]}} {{[-h|--help]}}`
|