From b5aa71ca780ba011aeeb79b32702ab4e05bf75c9 Mon Sep 17 00:00:00 2001 From: AndrewJop <88753213+AndrewJop@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:55:31 -0500 Subject: [PATCH] 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 --- pages/common/wiggle.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pages/common/wiggle.md diff --git a/pages/common/wiggle.md b/pages/common/wiggle.md new file mode 100644 index 000000000..b7c259e2c --- /dev/null +++ b/pages/common/wiggle.md @@ -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: . + +- 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`