wiggle: add page (#11494)

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>
pull/23/head
AndrewJop 2023-11-16 09:55:31 -05:00 committed by GitHub
parent ffe98e791a
commit b5aa71ca78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 0 deletions

29
pages/common/wiggle.md Normal file
View File

@ -0,0 +1,29 @@
# 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`