From abdf0e1482e33df16c131eccf8b72ce4ce8f205f Mon Sep 17 00:00:00 2001 From: Camilla Krag Jensen Date: Sat, 25 Oct 2014 13:20:07 +0200 Subject: [PATCH 1/3] Add patch command. --- pages/common/patch.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 pages/common/patch.md diff --git a/pages/common/patch.md b/pages/common/patch.md new file mode 100644 index 0000000000..912a50171c --- /dev/null +++ b/pages/common/patch.md @@ -0,0 +1,15 @@ +#patch + +> Patch a file or files with a diff file. + +- apply a patch + +`patch < {{patchfile}}.diff` + +- apply a patch to current directory + +`patch -p1 < {{patchfile}}.diff` + +- reverse a patch + +`patch -R < {{patchfile}}.diff` From 5ff0c017c515d815244e16c2f3ba42b01cc8f9b8 Mon Sep 17 00:00:00 2001 From: Camilla Krag Jensen Date: Tue, 28 Oct 2014 20:27:51 +0100 Subject: [PATCH 2/3] Add more explanation to top-level-description. --- pages/common/patch.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/common/patch.md b/pages/common/patch.md index 912a50171c..a5b79bbe25 100644 --- a/pages/common/patch.md +++ b/pages/common/patch.md @@ -1,6 +1,7 @@ #patch -> Patch a file or files with a diff file. +> Patch a file (or files) with a diff file. +> Note that diff files contain both the target filenames and list of changes. - apply a patch From a7c5a03cbb536be187e711f98a2aa87abfaed0c3 Mon Sep 17 00:00:00 2001 From: Camilla Krag Jensen Date: Wed, 29 Oct 2014 09:25:50 +0100 Subject: [PATCH 3/3] Change wording for "un-applying" patches. --- pages/common/patch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/common/patch.md b/pages/common/patch.md index a5b79bbe25..70e900fa6c 100644 --- a/pages/common/patch.md +++ b/pages/common/patch.md @@ -11,6 +11,6 @@ `patch -p1 < {{patchfile}}.diff` -- reverse a patch +- apply the reverse of a patch `patch -R < {{patchfile}}.diff`