From 87f73ac6d14554b0bae0312e116afd938e7ebac1 Mon Sep 17 00:00:00 2001 From: Adrian Molina Date: Tue, 30 Dec 2025 01:36:54 -0600 Subject: [PATCH 1/3] ignorar archivos solicitados --- carpetaSecreta/password | 1 - configuracion | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 carpetaSecreta/password delete mode 100644 configuracion diff --git a/carpetaSecreta/password b/carpetaSecreta/password deleted file mode 100644 index 1fa4b800..00000000 --- a/carpetaSecreta/password +++ /dev/null @@ -1 +0,0 @@ -pass: 1234 \ No newline at end of file diff --git a/configuracion b/configuracion deleted file mode 100644 index 81f237ad..00000000 --- a/configuracion +++ /dev/null @@ -1,2 +0,0 @@ -PC:local -URL:localhost \ No newline at end of file From d1b7015e6db625bdf29269f63d529a412bc0d251 Mon Sep 17 00:00:00 2001 From: Adrian Molina Date: Tue, 30 Dec 2025 01:40:32 -0600 Subject: [PATCH 2/3] nueva-funcionalidad commit 1 --- .gitignore | 5 +++++ diarioAlumno/diarioA.txt | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..546d4d2f --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +#ignorar carpetaSecreta +carpetaSecreta/ + +#ignorar archivo configuracion +configuracion \ No newline at end of file diff --git a/diarioAlumno/diarioA.txt b/diarioAlumno/diarioA.txt index db23ecbd..f2a04e42 100644 --- a/diarioAlumno/diarioA.txt +++ b/diarioAlumno/diarioA.txt @@ -1 +1,3 @@ -Aquí viene tu diario \ No newline at end of file +Aquí viene tu diario +Aqui agregamos rama 'nueva-funcionalidad' +primer commit \ No newline at end of file From 6e76e4a7d53f749c4883fc8721cc719fe4bb2c50 Mon Sep 17 00:00:00 2001 From: Adrian Molina Date: Tue, 30 Dec 2025 01:41:06 -0600 Subject: [PATCH 3/3] nueva-funcionalidad commit 2 --- diarioAlumno/diarioA.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diarioAlumno/diarioA.txt b/diarioAlumno/diarioA.txt index f2a04e42..1f8e80e8 100644 --- a/diarioAlumno/diarioA.txt +++ b/diarioAlumno/diarioA.txt @@ -1,3 +1,4 @@ Aquí viene tu diario Aqui agregamos rama 'nueva-funcionalidad' -primer commit \ No newline at end of file +primer commit +segundo commit \ No newline at end of file