diff options
author | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2017-03-17 22:44:31 -0700 |
---|---|---|
committer | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2017-03-17 22:44:31 -0700 |
commit | 60926e9fc770fc1f310306447220cb3740382b00 (patch) | |
tree | 1a1276b32fcc5388165bd42b685c0d9e83380a7b /docs/misc/patch.md | |
parent | 8022472fef91c59975f4e6d57097081729f87903 (diff) | |
download | librebootfr-60926e9fc770fc1f310306447220cb3740382b00.tar.gz librebootfr-60926e9fc770fc1f310306447220cb3740382b00.zip |
Let markdown handle <> gracefully
Diffstat (limited to 'docs/misc/patch.md')
-rw-r--r-- | docs/misc/patch.md | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/misc/patch.md b/docs/misc/patch.md index 073fdf9c..9f6125c5 100644 --- a/docs/misc/patch.md +++ b/docs/misc/patch.md @@ -12,11 +12,11 @@ Apply a patch ============= To apply a patch to a single file, do that in it's directory:\ -**\$ patch < foo.patch** +**\$ patch < foo.patch** Assuming that the patch is distributed in unified format identifying the file the patch should be applied to, the above will work. Otherwise:\ -**\$ patch foo.txt < bar.patch** +**\$ patch foo.txt < bar.patch** You can apply a patch to an entire directory, but note the "p level". What this means is that inside patch files will be the files that you @@ -25,7 +25,7 @@ the files ane located on your own computer instead of on the computer where the patch was created. 'p' level instructs the 'patch' utility to ignore parts of the path name to identify the files correctly. Usually a p level of 1 will work, so you would use:\ -**\$ patch -p1 < baz.patch** +**\$ patch -p1 < baz.patch** Change to the top level directory before running this. If a patch level of 1 cannot identify the files to patch, then inspect the patch file for @@ -33,14 +33,14 @@ file names. For example:\ **/home/user/do/not/panic/yet.c** and you are working in a directory that contains panic/yet.c, use:\ -**\$ patch -p5 < baz.patch** +**\$ patch -p5 < baz.patch** You usually count one up for each path separator (forward slash) removed from the beginning of the path, until you are left with a path that exists in the current working directory. The count is the p level. Removing a patch using the -R flag\ -**\$ patch -p5 -R < baz.patch** +**\$ patch -p5 -R < baz.patch** [Back to top of page.](#pagetop) @@ -50,13 +50,13 @@ Create a patch with diff ======================== Diff can create a patch for a single file:\ -**\$ diff -u original.c new.c > original.patch** +**\$ diff -u original.c new.c > original.patch** For diff'ing a source tree:\ **\$ cp -R original new** Do whatever you want in new/ and then diff it:\ -**\$ diff -rupN original/ new/ > original.patch** +**\$ diff -rupN original/ new/ > original.patch** [Back to top of page.](#pagetop) @@ -70,7 +70,7 @@ git is something special. Note: this won't show new files created. Just make whatever changes you want to a git clone and then:\ -**\$ git diff > patch.git** +**\$ git diff > patch.git** Note the git revision that you did this with:\ **\$ git log** @@ -103,7 +103,7 @@ aswell, instead of just applying the patch. -Copyright © 2014, 2015 Leah Rowe <info@minifree.org>\ +Copyright © 2014, 2015 Leah Rowe <info@minifree.org>\ Permission is granted to copy, distribute and/or modify this document under the terms of the Creative Commons Attribution-ShareAlike 4.0 International license or any later version published by Creative |