summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2013-10-10 22:24:09 +0200
committerJan Pokorný <jpokorny@redhat.com>2013-10-10 22:24:09 +0200
commit56f2cc4b975a6c709c654fa85998f0b5bdf820c9 (patch)
tree385e257544b81d11d3c524aa680e3089d0f0f4ff
parent607c64abf5df97e60bec1ab21908a62f5836c3ed (diff)
downloadpatch-fix-offsets-56f2cc4b975a6c709c654fa85998f0b5bdf820c9.zip
patch-fix-offsets-56f2cc4b975a6c709c654fa85998f0b5bdf820c9.tar.gz
patch-fix-offsets-56f2cc4b975a6c709c654fa85998f0b5bdf820c9.tar.xz
README: some clarifications
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--README6
1 files changed, 4 insertions, 2 deletions
diff --git a/README b/README
index 9878907..a949950 100644
--- a/README
+++ b/README
@@ -7,14 +7,16 @@ offsets. You want convenient, non-tedious way to get perfectly fitting one.
How to achieve it:
$ patch-fix-offsets -p1 wrongoffsets.patch > goodoffsets.patch
+$ # alternatively in pipe with recountdiff for extra sanity
Alternatives:
1. apply patch and rediff (possibly changing the format of the patch!)
-$ cp -R <project within which to apply the patch>{,.orig}
+$ cp -pR ${PROJECT_DIR}{,.orig}
$ patch -p1 <wrongoffsets.patch
-$ diff -urN <project within which to apply the patch>{.orig,} > goodoffsets.patch
+$ diff -urN ${PROJECT_DIR}{.orig,} > goodoffsets.patch
+$ mv ${PROJECT_DIR}{.orig,}
TBD: wiggle, merge, ...