aboutsummaryrefslogtreecommitdiff
path: root/docs/misc/patch.md
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa@rosenzweig.io>2017-03-17 22:55:29 -0700
committerAlyssa Rosenzweig <alyssa@rosenzweig.io>2017-03-17 22:55:29 -0700
commitb967baa8118b34fb3fd36d4c3b8b1c21495f9aa4 (patch)
treef461ce307a781ba49ea3751482736e68d7c76f04 /docs/misc/patch.md
parent60926e9fc770fc1f310306447220cb3740382b00 (diff)
downloadlibrebootfr-b967baa8118b34fb3fd36d4c3b8b1c21495f9aa4.tar.gz
librebootfr-b967baa8118b34fb3fd36d4c3b8b1c21495f9aa4.zip
Cleanup some escaped symbols
Diffstat (limited to 'docs/misc/patch.md')
-rw-r--r--docs/misc/patch.md26
1 files changed, 13 insertions, 13 deletions
diff --git a/docs/misc/patch.md b/docs/misc/patch.md
index 9f6125c5..ee594a9e 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**
+**$ 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,13 +70,13 @@ 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**
+**$ git log**
Alternatively (better yet), commit your changes and then use:\
-\$ **git format-patch -N**\
+$ **git format-patch -N**\
Replace N with the number of commits that you want to show.
[Back to top of page.](#pagetop)
@@ -90,10 +90,10 @@ it really is.
Now to apply that patch in the future, just git clone it again and do
with the git revision you found from above:\
-**\$ git reset \--hard REVISIONNUMBER**
+**$ git reset \--hard REVISIONNUMBER**
Now put patch.git in the git clone directory and do:\
-**\$ git apply patch.git**
+**$ git apply patch.git**
If you use a patch from git format-patch, then use **git am patch.git**
instead of **git apply patch.git**. git-am will re-create the commits