@@ -17,147 +17,170 @@ <body> - <header> + <div class="section"> <h1 id="pagetop">Diff and patch</h1> - <aside>This is just a quick guide for reference, use 'man' to know more.</aside> - </header> - - - <a href="index.html">back to index</a> - - -<hr/> - - <h1> - Apply a patch - </h1> - - - 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: - $ 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 - intend to patch, identified by path names that might be different - when 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 - - - - 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 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 - - - - 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 - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - <h1> - Create a patch with diff - </h1> - - - Diff can create a patch for a single file: - $ 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 - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - <h1> - git diff - </h1> - - - git is something special. - - - - Just make whatever changes you want to a git clone and then: - $ git diff > patch.git - - - - Note the git revision that you did this with: - $ git log - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - <h1> - git apply - </h1> - - 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 - - - - Now put patch.git in the git clone directory and do: - $ git apply patch.git - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - - Copyright © 2014 Francis Rowe <info@gluglug.org.uk> - This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions. - A copy of the license can be found at <a href="../license.txt">../license.txt</a>. - - - - This document is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See <a href="../license.txt">../license.txt</a> for more information. - + This is just a quick guide for reference, use 'man' to know more. + + <a href="index.html">Back to index</a> + + </div> + + <div class="section"> + + <h1> + Apply a patch + </h1> + + + 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: + $ 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 + intend to patch, identified by path names that might be different + when 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 + + + + 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 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 + + + + 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 + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + <h1> + Create a patch with diff + </h1> + + + Diff can create a patch for a single file: + $ 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 + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + <h1> + git diff + </h1> + + + 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 + + + + Note the git revision that you did this with: + $ git log + + + + 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. + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + <h1> + git apply + </h1> + + 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 + + + + Now put patch.git in the git clone directory and do: + $ 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 aswell, instead of just applying the patch. + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + + Copyright © 2014, 2015 Francis Rowe <info@gluglug.org.uk> + This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions. + A copy of the license can be found at <a href="../license.txt">../license.txt</a>. + + + + This document is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See <a href="../license.txt">../license.txt</a> for more information. + + + </div> </body> </html> -- cgit v0.9.1

From 4c3d46238022f0c9955ae7e8b10c9f1716dd871a Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Wed, 04 Feb 2015 04:14:49 -0500 Subject: Documentation: implement theme, drastically improve readability --- (limited to 'docs/misc/patch.html') diff --git a/docs/misc/patch.html b/docs/misc/patch.html index 3d926ac..681fdfb 100644 --- a/docs/misc/patch.html +++ b/docs/misc/patch.html @@ -6,7 +6,7 @@ @@ -17,147 +17,170 @@ <body> - <header> + <div class="section"> <h1 id="pagetop">Diff and patch</h1> - <aside>This is just a quick guide for reference, use 'man' to know more.</aside> - </header> - - - <a href="index.html">back to index</a> - - -<hr/> - - <h1> - Apply a patch - </h1> - - - 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: - $ 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 - intend to patch, identified by path names that might be different - when 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 - - - - 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 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 - - - - 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 - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - <h1> - Create a patch with diff - </h1> - - - Diff can create a patch for a single file: - $ 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 - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - <h1> - git diff - </h1> - - - git is something special. - - - - Just make whatever changes you want to a git clone and then: - $ git diff > patch.git - - - - Note the git revision that you did this with: - $ git log - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - <h1> - git apply - </h1> - - 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 - - - - Now put patch.git in the git clone directory and do: - $ git apply patch.git - - - <a href="#pagetop">Back to top of page.</a> - -<hr/> - - - Copyright © 2014 Francis Rowe <info@gluglug.org.uk> - This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions. - A copy of the license can be found at <a href="../license.txt">../license.txt</a>. - - - - This document is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See <a href="../license.txt">../license.txt</a> for more information. - + This is just a quick guide for reference, use 'man' to know more. + + <a href="index.html">Back to index</a> + + </div> + + <div class="section"> + + <h1> + Apply a patch + </h1> + + + 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: + $ 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 + intend to patch, identified by path names that might be different + when 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 + + + + 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 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 + + + + 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 + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + <h1> + Create a patch with diff + </h1> + + + Diff can create a patch for a single file: + $ 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 + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + <h1> + git diff + </h1> + + + 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 + + + + Note the git revision that you did this with: + $ git log + + + + 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. + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + <h1> + git apply + </h1> + + 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 + + + + Now put patch.git in the git clone directory and do: + $ 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 aswell, instead of just applying the patch. + + + <a href="#pagetop">Back to top of page.</a> + + </div> + + <div class="section"> + + + Copyright © 2014, 2015 Francis Rowe <info@gluglug.org.uk> + This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions. + A copy of the license can be found at <a href="../license.txt">../license.txt</a>. + + + + This document is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See <a href="../license.txt">../license.txt</a> for more information. + + + </div> </body> </html> -- cgit v0.9.1