diff options
Diffstat (limited to 'content/articles/crear-parches-con-git.md')
| -rw-r--r-- | content/articles/crear-parches-con-git.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/articles/crear-parches-con-git.md b/content/articles/crear-parches-con-git.md index c86da73..1c482fc 100644 --- a/content/articles/crear-parches-con-git.md +++ b/content/articles/crear-parches-con-git.md @@ -98,13 +98,13 @@ En el primero, crearé los archivos que puse de ejemplo (valga la redundancia) y **script.sh:** - #!sh + :::bash #!/bin/bash echo "Hello world" **script.sh.new:** - #!sh + :::sh #!/bin/sh echo "Hello world" echo "This is a patched file :D" @@ -116,7 +116,7 @@ Ahora haremos lo que la mayoría de tutoriales de internet te dicen que hagas: Y me queda así: - #!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 @@ @@ -131,7 +131,7 @@ Todo aparentemente bien, pero ahora apliquemos dicho parche $ 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: @@ -159,7 +159,7 @@ Bien, ahora hagamos el parche con diff: $ diff -ur a b ``` - #!diff + :::diff Sólo en b: archivo_binario.bin diff -ur a/script.sh b/script.sh --- a/script.sh 2018-03-16 15:37:27.513802777 -0300 @@ -184,7 +184,7 @@ Mira lo que pasa si uso `git` en vez de `diff`: $ git diff --no-prefix --no-index --no-renames --binary a b ``` - #!diff + :::diff diff --git b/archivo_binario.bin b/archivo_binario.bin new file mode 100644 index 0000000000000000000000000000000000000000..1ce3c1c596d7a7f400b0cc89bda5a41eed2780c5 |