mirror of
https://github.com/tldr-pages/tldr.git
synced 2025-04-23 22:42:08 +02:00
b5aa71ca78
Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com> Co-authored-by: Sebastiaan Speck <shem.speck@gmail.com>
29 lines
922 B
Markdown
29 lines
922 B
Markdown
# 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/my_patch.patch}}`
|
|
|
|
- Apply changes to the [o]utput file:
|
|
|
|
`wiggle {{path/to/my_patch.patch}} -o {{path/to/output_file.txt}}`
|
|
|
|
- Take any changes in `file.rej` that could not have been applied and merge them into a file:
|
|
|
|
`wiggle --replace {{path/to/file}} {{path/to/file.rej}}`
|
|
|
|
- E[x]tract one branch of a patch or merge file:
|
|
|
|
`wiggle -x {{path/to/my_patch.patch}}`
|
|
|
|
- Apply a patch and save the compared words to the [o]utput file:
|
|
|
|
`wiggle --words {{path/to/my_word_patch.patch}} -o {{path/to/word_patched_code.c}}`
|
|
|
|
- Display help about the merge function:
|
|
|
|
`wiggle --merge --help`
|