diff options
| author | Leah Rowe <info@minifree.org> | 2017-04-04 00:39:08 +0200 |
|---|---|---|
| committer | Gogs <gogitservice@gmail.com> | 2017-04-04 00:39:08 +0200 |
| commit | c7908aa7fe8e7cc9b00409bd7c93c58c0e6d1261 (patch) | |
| tree | 9c76f68bc63b7a9fed0c22e4ffdcc2f14be0ee69 /docs/misc/patch.md | |
| parent | 3d08f096b8ff9857fc066e15d318dcf145807343 (diff) | |
| parent | cb8d13228f7dcb58f7e891dfd57493209ecc5518 (diff) | |
| download | librebootfr-c7908aa7fe8e7cc9b00409bd7c93c58c0e6d1261.tar.gz librebootfr-c7908aa7fe8e7cc9b00409bd7c93c58c0e6d1261.zip | |
Merge branch 'www/template' of vimuser/libreboot into master
Diffstat (limited to 'docs/misc/patch.md')
| -rw-r--r-- | docs/misc/patch.md | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/docs/misc/patch.md b/docs/misc/patch.md index 73d4979a..419654a7 100644 --- a/docs/misc/patch.md +++ b/docs/misc/patch.md @@ -4,8 +4,6 @@ This is just a quick guide for reference, use 'man' to know more. [Back to index](./) - - Apply a patch ============= @@ -13,7 +11,6 @@ To apply a patch to a single file, do that in it's directory: $ 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: @@ -46,10 +43,6 @@ Removing a patch using the -R flag $ patch -p5 -R < baz.patch -[Back to top of page.](#pagetop) - - - Create a patch with diff ======================== @@ -65,10 +58,6 @@ Do whatever you want in new/ and then diff it: $ diff -rupN original/ new/ > original.patch -[Back to top of page.](#pagetop) - - - git diff ======== @@ -88,10 +77,6 @@ Alternatively (better yet), commit your changes and then use: $ git format-patch -N Replace N with the number of commits that you want to show. -[Back to top of page.](#pagetop) - - - git apply ========= @@ -110,10 +95,6 @@ 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 aswell, instead of just applying the patch. -[Back to top of page.](#pagetop) - - - 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 |