diff options
Diffstat (limited to 'content/articles/crear-parches-con-git.en.md')
| -rw-r--r-- | content/articles/crear-parches-con-git.en.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/articles/crear-parches-con-git.en.md b/content/articles/crear-parches-con-git.en.md index daf6d40..4243def 100644 --- a/content/articles/crear-parches-con-git.en.md +++ b/content/articles/crear-parches-con-git.en.md @@ -107,13 +107,13 @@ In the first one, I will create the files that I put as an example **script.sh:** - #!bash + :::bash #!/bin/bash echo "Hello world" **script.sh.new:** - #!sh + :::sh #!/bin/sh echo "Hello world" echo "This is a patched file :D" @@ -125,7 +125,7 @@ Now we will do what most internet tutorials tell you to do: And it looks like this: - #!diff + :::diff --- script.sh 2018-03-16 15:52:49.887087539 -0300 +++ script.sh.new 2018-03-16 15:53:02.490420209 -0300 @@ -1,2 +1,3 @@ @@ -140,7 +140,7 @@ Everything apparently fine, but now let's apply that patch $ diff -u script.sh script.sh.new | patch -p1 -i /dev/stdin ``` - #!diff + :::diff can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: @@ -168,7 +168,7 @@ Okay, now let's make the patch with diff: $ diff -ur a b ``` - #!diff + :::diff Only in b: binary_file.bin diff -ur a/script.sh b/script.sh --- a/script.sh 2018-03-16 15:37:27.513802777 -0300 @@ -193,7 +193,7 @@ See what happens if I use `git` instead of `diff`: $ git diff --no-prefix --no-index --no-renames --binary a b ``` - #!diff + :::diff diff --git b/binary_file.bin b/binary_file.bin new file mode 100644 index 0000000000000000000000000000000000000000..1ce3c1c596d7a7f400b0cc89bda5a41eed2780c5 |