diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2018-01-24 14:53:48 -0800 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2018-03-07 17:19:12 -0800 |
| commit | 9ebe5840f8fb04da1e80ad973c2db4e9de677a1a (patch) | |
| tree | 88bc9f1ee35f175c4c52d08f921d8dcb4fbf1631 /qf.rst | |
| parent | 7d4df0eda01c1c3d4c9027433f9edbd522143aeb (diff) | |
qf: Add more wiggle helpers.
When working with wiggle to easily solve rebasing
conflicts we also need to be able to easily continue,
easily see the impacted files and easily clean the
repo to avoid ending up with many .rej and .porig files.
v2: Remove -r from rm. (Lucas)
Use -z instead of '== ""' comparison. (Lucas)
Add documentation to the helpers. (Required by make check).
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'qf.rst')
| -rw-r--r-- | qf.rst | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -200,6 +200,22 @@ Resets the git index and then (re-)applies all currently applied quilt patches to it. Useful to use git tools like git diff to compare changes against the quilt patch state. +conflict-files +-------------- +List the files that are probably in a unresolved stage of conflict. +Wiggle push will leave .rej and .porig files behind. +This is useful for manual conflict solving during the quilt rebase. + +continue +-------- +Clean up after wiggle and continue with quilt push -a to continue +applying and rebasing all the following patches. + +wiggle-clean +------------ +Clean up all .rej and .porig files that wiggle probably +left behind. + wiggle-push|wp -------------- Force-push the next patch and then wiggle in any conflicts. Does |