From 96b887132d43ccf3cfa6ddd12f2cb739a9ba58c9 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Thu, 18 Sep 2025 19:05:34 +0200 Subject: [PATCH 01/29] subida de ficheros de ejemplo --- dir1/clase1_fichero2.txt | 0 dir1/fichero_clase1.txt | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 dir1/clase1_fichero2.txt create mode 100644 dir1/fichero_clase1.txt diff --git a/dir1/clase1_fichero2.txt b/dir1/clase1_fichero2.txt new file mode 100644 index 0000000..e69de29 diff --git a/dir1/fichero_clase1.txt b/dir1/fichero_clase1.txt new file mode 100644 index 0000000..e69de29 From ee8408490165ba68a14daacf89af8f1b59284133 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Thu, 18 Sep 2025 19:09:42 +0200 Subject: [PATCH 02/29] =?UTF-8?q?se=20a=C3=B1ade=20hola=20mundo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/fichero_clase1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dir1/fichero_clase1.txt b/dir1/fichero_clase1.txt index e69de29..5e4357f 100644 --- a/dir1/fichero_clase1.txt +++ b/dir1/fichero_clase1.txt @@ -0,0 +1 @@ +hola mundo 1 From d5ab8698735cfd00fd4f27f3e4c4de890523e98b Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Thu, 18 Sep 2025 19:27:35 +0200 Subject: [PATCH 03/29] subo fichero mio --- dir1/file.txt | 2 +- dir1/file_mio.txt | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 dir1/file_mio.txt diff --git a/dir1/file.txt b/dir1/file.txt index e949a82..0cfbf08 100644 --- a/dir1/file.txt +++ b/dir1/file.txt @@ -1 +1 @@ -Fichero de ejemplo +2 diff --git a/dir1/file_mio.txt b/dir1/file_mio.txt new file mode 100644 index 0000000..e69de29 From 4693d7f11a64860e907061b362f00b01264df585 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 09:43:10 +0200 Subject: [PATCH 04/29] lo comiteo --- nuevo.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 nuevo.txt diff --git a/nuevo.txt b/nuevo.txt new file mode 100644 index 0000000..e69de29 From cd99dbfbdb630eb8659c4a06ab0d36e5cafdba89 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 10:19:29 +0200 Subject: [PATCH 05/29] lineas 1 - 3 --- nuevo.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nuevo.txt b/nuevo.txt index e69de29..b0d0d97 100644 --- a/nuevo.txt +++ b/nuevo.txt @@ -0,0 +1,2 @@ +linea 1 +linea 3 From dc0aef83642068e11d25c14440956bb6baeacc91 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 10:20:17 +0200 Subject: [PATCH 06/29] lineas 2 - 4 --- nuevo.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nuevo.txt b/nuevo.txt index b0d0d97..a59b1dd 100644 --- a/nuevo.txt +++ b/nuevo.txt @@ -1,2 +1,4 @@ linea 1 +2222222 linea 3 +4444444 From 4b4b881278c5773dd5ae530bbf4bf84abf251064 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 10:20:54 +0200 Subject: [PATCH 07/29] lineas 5 --- nuevo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/nuevo.txt b/nuevo.txt index a59b1dd..36263a6 100644 --- a/nuevo.txt +++ b/nuevo.txt @@ -2,3 +2,4 @@ linea 1 2222222 linea 3 4444444 +5555555 From b5a84a5f3effac6c2897655ea72446a9a8c3b2b8 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 10:59:50 +0200 Subject: [PATCH 08/29] termino ejercicio 01 --- nuevo.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/nuevo.txt b/nuevo.txt index 36263a6..a59b1dd 100644 --- a/nuevo.txt +++ b/nuevo.txt @@ -2,4 +2,3 @@ linea 1 2222222 linea 3 4444444 -5555555 From 51d78a6487fe85e469b98b90ca68fc0522651149 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 11:07:05 +0200 Subject: [PATCH 09/29] cambio al nro 3 --- dir1/file.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir1/file.txt b/dir1/file.txt index e949a82..00750ed 100644 --- a/dir1/file.txt +++ b/dir1/file.txt @@ -1 +1 @@ -Fichero de ejemplo +3 From 83786739018bc86be51c54b0bb62b639e34b2621 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 13:26:32 +0200 Subject: [PATCH 10/29] creo el fichero1.txt --- dir1/file1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dir1/file1.txt diff --git a/dir1/file1.txt b/dir1/file1.txt new file mode 100644 index 0000000..e69de29 From 7c901e3bae3a7272bdd5fb3f5afe0c449f6a8b02 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 13:29:58 +0200 Subject: [PATCH 11/29] creo el fichero2.txt en main --- dir1/file2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dir1/file2.txt diff --git a/dir1/file2.txt b/dir1/file2.txt new file mode 100644 index 0000000..e69de29 From ca8eca07bb91687154b9839286ca5ac910b4c561 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sat, 20 Sep 2025 23:54:24 +0200 Subject: [PATCH 12/29] agrego el archivo en UPPERCASE --- dir1/hello_world.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir1/hello_world.txt b/dir1/hello_world.txt index 8ab686e..a261b14 100644 --- a/dir1/hello_world.txt +++ b/dir1/hello_world.txt @@ -1 +1 @@ -Hello, World! +HELLO WORLD !!! From 869a604bf6e8276e70c2da7f04782e8bc2b7230e Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 00:14:19 +0200 Subject: [PATCH 13/29] agrego saludo --- dir1/greeting.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dir1/greeting.txt diff --git a/dir1/greeting.txt b/dir1/greeting.txt new file mode 100644 index 0000000..e69de29 From ba0785ae695a36d5ba9bb05636f6d95742f6dbb4 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 00:16:57 +0200 Subject: [PATCH 14/29] crear el archivo README --- dir1/README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dir1/README.md diff --git a/dir1/README.md b/dir1/README.md new file mode 100644 index 0000000..c8cb329 --- /dev/null +++ b/dir1/README.md @@ -0,0 +1,3 @@ +linea nro 1 +la linea dos +en la 3 digo que solo un par de lineas From 48291abbbd8000fde695398814ef38874ad4dde8 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 00:50:51 +0200 Subject: [PATCH 15/29] agrego archivo frutas.txt con la palabra manzana desde main --- dir1/frutas.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 dir1/frutas.txt diff --git a/dir1/frutas.txt b/dir1/frutas.txt new file mode 100644 index 0000000..5e9a329 --- /dev/null +++ b/dir1/frutas.txt @@ -0,0 +1 @@ +manzana From 8c0d9d0cc8c60a48ee7bde299a57f0561d7868d3 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 00:56:27 +0200 Subject: [PATCH 16/29] agrego archivo frutas.txt con la palabra pera desde feature/pera --- dir1/frutas.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir1/frutas.txt b/dir1/frutas.txt index 5e9a329..3a09b2d 100644 --- a/dir1/frutas.txt +++ b/dir1/frutas.txt @@ -1 +1 @@ -manzana +pera From 508ca6651659234c225a3fb3baf68e1b1a04d2cb Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:05:17 +0200 Subject: [PATCH 17/29] agrego archivo frutas.txt con la palabra platanos desde main --- dir1/frutas.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir1/frutas.txt b/dir1/frutas.txt index 5e9a329..13aeaba 100644 --- a/dir1/frutas.txt +++ b/dir1/frutas.txt @@ -1 +1 @@ -manzana +platanos From 4e72258eeaa23302a6189c98707298980b567397 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:15:57 +0200 Subject: [PATCH 18/29] =?UTF-8?q?Commit=201:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 dir1/archivo.txt diff --git a/dir1/archivo.txt b/dir1/archivo.txt new file mode 100644 index 0000000..837f3e9 --- /dev/null +++ b/dir1/archivo.txt @@ -0,0 +1 @@ +Línea 1 From 4a3cf60ec7ee05171a3f8baa83b62b423c6e7933 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:16:26 +0200 Subject: [PATCH 19/29] =?UTF-8?q?Commit=202:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index 837f3e9..da4e490 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1 +1,2 @@ Línea 1 +Línea 2 From ec6c41d80fceedf837d4bd30c9d6363303288c4f Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:16:53 +0200 Subject: [PATCH 20/29] =?UTF-8?q?Commit=203:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index da4e490..7c670a5 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,2 +1,3 @@ Línea 1 Línea 2 +Línea 3 From 5a9f02d10c8b3795a5ae692953e151e3ec668589 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:21:11 +0200 Subject: [PATCH 21/29] =?UTF-8?q?Revert=20"Commit=203:=20A=C3=B1adir=20l?= =?UTF-8?q?=C3=ADnea=203"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ec6c41d80fceedf837d4bd30c9d6363303288c4f. --- dir1/archivo.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index 7c670a5..da4e490 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,3 +1,2 @@ Línea 1 Línea 2 -Línea 3 From 7804e6359e892f3ec5967fcbc0a8085e81349d72 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:22:56 +0200 Subject: [PATCH 22/29] =?UTF-8?q?Commit=204:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index da4e490..a454057 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,2 +1,3 @@ Línea 1 Línea 2 +Línea 4 From b000174feb70d3b9eda6d4ac6a911070adae1ba7 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:22:57 +0200 Subject: [PATCH 23/29] =?UTF-8?q?Commit=205:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index a454057..eb91947 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,3 +1,4 @@ Línea 1 Línea 2 Línea 4 +Línea 5 From 23be0129e560189b963e2edce054e3d0e8627528 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:23:27 +0200 Subject: [PATCH 24/29] =?UTF-8?q?Revert=20"Commit=205:=20A=C3=B1adir=20l?= =?UTF-8?q?=C3=ADnea=205"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b000174feb70d3b9eda6d4ac6a911070adae1ba7. --- dir1/archivo.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index eb91947..a454057 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,4 +1,3 @@ Línea 1 Línea 2 Línea 4 -Línea 5 From 5ab411b3e56c30a2fa409db641eda8d34fcc2fe4 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 01:23:33 +0200 Subject: [PATCH 25/29] =?UTF-8?q?Revert=20"Commit=204:=20A=C3=B1adir=20l?= =?UTF-8?q?=C3=ADnea=204"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7804e6359e892f3ec5967fcbc0a8085e81349d72. --- dir1/archivo.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index a454057..da4e490 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,3 +1,2 @@ Línea 1 Línea 2 -Línea 4 From 9e844a17660742b5c5ecd64e4dbc2b6fb7233e63 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 10:14:14 +0200 Subject: [PATCH 26/29] =?UTF-8?q?Commit=201:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index da4e490..837f3e9 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,2 +1 @@ Línea 1 -Línea 2 From 74dbacfd60f401cefc96d86d7deb89cc3c009855 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 10:14:42 +0200 Subject: [PATCH 27/29] =?UTF-8?q?Commit=202:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index 837f3e9..da4e490 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1 +1,2 @@ Línea 1 +Línea 2 From 73d61e216280d4149e02ea43a2a46f6754d1a971 Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 10:32:08 +0200 Subject: [PATCH 28/29] =?UTF-8?q?Commit=203:=20A=C3=B1adir=20l=C3=ADnea=20?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/archivo.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dir1/archivo.txt b/dir1/archivo.txt index da4e490..694962c 100644 --- a/dir1/archivo.txt +++ b/dir1/archivo.txt @@ -1,2 +1,5 @@ Línea 1 Línea 2 +Línea 3 +Ultima linea +Línea 3 From 94d2e7b03b7ebc3c94cb708d9a77e688870b2d9a Mon Sep 17 00:00:00 2001 From: FranxiscoDev Date: Sun, 21 Sep 2025 11:23:57 +0200 Subject: [PATCH 29/29] =?UTF-8?q?A=C3=B1adir=20l=C3=ADnea=20de=20prueba=20?= =?UTF-8?q?para=20pull=20request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dir1/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dir1/README.md b/dir1/README.md index c8cb329..e9f78c6 100644 --- a/dir1/README.md +++ b/dir1/README.md @@ -1,3 +1,4 @@ linea nro 1 la linea dos en la 3 digo que solo un par de lineas +Este es un cambio de prueba para una Pull Request.