|
1016 | 1016 | }, |
1017 | 1017 | "11": { |
1018 | 1018 | "orden": "11", |
1019 | | - "titulo": "Revisando el historial con git log", |
1020 | | - "tituloCorto": "Usado git log", |
| 1019 | + "titulo": "Reviweing the history with git log", |
| 1020 | + "tituloCorto": "Using git log", |
1021 | 1021 | "tareas": [ |
1022 | | - "¿Qué tal? Ya llevamos dos commits hasta ahora.", |
1023 | | - "Git nos ofrece un comando que permite revisar un historial con todos los commits que hemos hecho hasta el momento en orden cronológico. Este comando es <strong>git log</strong>" |
| 1022 | + "How is it going? We have made two commits so far.", |
| 1023 | + "Git offers us a command that allows us to review a history with all the commits we have made so far in chronological order. This command is <strong>git log</strong>" |
1024 | 1024 | ], |
1025 | 1025 | "comando": "git log", |
1026 | 1026 | "alert": "Did not use git log", |
1027 | 1027 | "successMessages": [ |
1028 | 1028 | "<span class=\"yellow\">commit: 3852b4db1634463d0bb4d267edb7b3f9cd02ace1</span>", |
1029 | 1029 | "Author: 4Geeks Student <student@4geeksacademy.co>", |
1030 | 1030 | "Date: Fri Sep 19 18:30:00 2017 -0400", |
1031 | | - " Agregar mi_plan.txt", |
| 1031 | + " Add mi_plan.txt", |
1032 | 1032 | " ", |
1033 | 1033 | "<span class=\"yellow\">commit: b652edfd888cd3d5e7fcb857d0dabc5a0fcb5e28</span>", |
1034 | 1034 | "Author: 4Geeks Student <student@4geeksacademy.co>", |
1035 | 1035 | "Date: Thu Sep 18 18:00:32 2017 -0400", |
1036 | | - " Agregar todos los archivos de texto" |
| 1036 | + " Add all the text files" |
1037 | 1037 | ], |
1038 | 1038 | "repoStatus": { |
1039 | 1039 | "branch": "master", |
|
1045 | 1045 | "mi_plan.txt" |
1046 | 1046 | ], |
1047 | 1047 | "commits": [ |
1048 | | - "20b5ccd - Agregar mi_plan.txt", |
1049 | | - "3852b4d - Agregar todos los archivos de texto" |
| 1048 | + "20b5ccd - Add mi_plan.txt", |
| 1049 | + "3852b4d - Add all the text files" |
1050 | 1050 | ] |
1051 | 1051 | } |
1052 | 1052 | }, |
1053 | 1053 | "12": { |
1054 | 1054 | "orden": "12", |
1055 | | - "titulo": "Manejando repositorios remotos", |
| 1055 | + "titulo": "Managing remote repositories", |
1056 | 1056 | "tituloCorto": "Git remote", |
1057 | 1057 | "tareas": [ |
1058 | | - "Bien, ya hemos aprendido los comandos más básicos de Git. Ahora veamos su utilidad práctica. Imagina que quieres que otras personas tengan acceso a tu repositorio. Para lograr debes subir nuestro repositorio a una plataforma como <strong><a href='https://github.com/' target='_blank'>GitHub</a></strong> que se encarga resguardar repositorios publicos y privados en sus servidores.", |
1059 | | - "Ahora, una vez creado un repositorio en GitHub tendremos que asociarlo a nuestro repositorio local, para ello usamos <strong>git remote add</strong> seguido del nombre con el cual queremos asociar el repositorio remoto que deseamos agregar y de su URL. Se acostumbra llamar al repositorio remoto principal <strong>origin</strong>, así que haremos eso. Y su URL es <strong>https://github.com/4geeksAcademy/project.git</strong>. Esta vez no son necesarias las comillas." |
| 1058 | + "Now, we have already learned the most basic Git commands. Now let's look at its practical use. Imagine that you want other people to have access to your repository. For that you need to upload our repository to a platform like <strong><a href='https://github.com/' target='_blank'>GitHub</a></strong> which is in charge of storing public and private repositories in its servers.", |
| 1059 | + "Now, once a repository is created, we will need to link it to our local repository; for that we use <strong>git remote add</strong> followed by the name that we want to associate with the remote repository that we want to add and its URL. Usually we call the main remote repository <strong>origin</strong> so we'll do that. And its URL is <strong>https://github.com/4geeksAcademy/project.git</strong>. This time we don't need quotes." |
1060 | 1060 | ], |
1061 | 1061 | "comando": "git remote add origin https://github.com/4geeksAcademy/project.git", |
1062 | 1062 | "alert": "Did not use git remote add", |
1063 | 1063 | "successMessages": [ |
1064 | | - "<span class=\"success\">Repositorio agregado con éxito</span>" |
| 1064 | + "<span class=\"success\">Repository added successfully</span>" |
1065 | 1065 | ], |
1066 | 1066 | "repoStatus": { |
1067 | 1067 | "branch": "master", |
|
1073 | 1073 | "mi_plan.txt" |
1074 | 1074 | ], |
1075 | 1075 | "commits": [ |
1076 | | - "20b5ccd - Agregar mi_plan.txt", |
1077 | | - "3852b4d - Agregar todos los archivos de texto" |
| 1076 | + "20b5ccd - Added mi_plan.txt", |
| 1077 | + "3852b4d - Added all the text files" |
1078 | 1078 | ] |
1079 | 1079 | } |
1080 | 1080 | }, |
1081 | 1081 | "13": { |
1082 | 1082 | "orden": "13", |
1083 | | - "titulo": "Usando git push", |
| 1083 | + "titulo": "Using git push", |
1084 | 1084 | "tituloCorto": "Git push", |
1085 | 1085 | "tareas": [ |
1086 | | - "Una vez asociado nuestro repositorio local solo tenemos que subir nuestros archivos locales a ese repositorio en línea, a esto se le llama hacer un <strong>push</strong>.", |
1087 | | - "Para hacerlo usamos el comando <strong>git push -u</strong> seguido del nombre del repositorio remoto a donde queremos hacer el push (origin) y luego el nombre de la <em>rama</em> del repositorio local donde están nuestros archivos. Por defecto, al inicializar un repositorio se crea una rama local llamada <strong>master</strong>, allí están nuestros documentos.", |
1088 | | - "¿Qué tal si lo intentas?" |
| 1086 | + "Once our local repository has been associated, we just need to upload our local files to that online repository. This is called making a <strong>push</strong>.", |
| 1087 | + "For that we use the command <strong>git push -u</strong> followed by the name of the remote repository where we want to make the push to (origin) and then the name of the <em>branch</em> of the local repository where our files live. By default, when intializing a repository, a local branch is created called <strong>master</strong>, that's where our documents live.", |
| 1088 | + "How about you try it?" |
1089 | 1089 | ], |
1090 | 1090 | "comando": "git push -u origin master", |
1091 | 1091 | "alert": "Did not use git push", |
1092 | 1092 | "successMessages": [ |
1093 | | - "Branch master set up to track remote branch" |
| 1093 | + "Branch master configurada para observar rama remota" |
1094 | 1094 | ], |
1095 | 1095 | "repoStatus": { |
1096 | 1096 | "branch": "master", |
|
1102 | 1102 | "mi_plan.txt" |
1103 | 1103 | ], |
1104 | 1104 | "commits": [ |
1105 | | - "20b5ccd - Agregar mi_plan.txt", |
1106 | | - "3852b4d - Agregar todos los archivos de texto" |
| 1105 | + "20b5ccd - Added mi_plan.txt", |
| 1106 | + "3852b4d - Added all the text files" |
1107 | 1107 | ] |
1108 | 1108 | } |
1109 | 1109 | }, |
1110 | 1110 | "14": { |
1111 | 1111 | "orden": "14", |
1112 | | - "titulo": "Usando git pull", |
| 1112 | + "titulo": "Using git pull", |
1113 | 1113 | "tituloCorto": "Git pull", |
1114 | 1114 | "tareas": [ |
1115 | | - "Es bueno que siempre trabajes con la versión más actual de tu repositorio, es por ello que antes de hacer cualquier cosa siempre actualices tu repositorio local porque tal vez algún miembro de tu equipo ha realizado algún cambio importante", |
1116 | | - "Para actualizar nuestro repositorio local usamos <strong>git pull</strong> seguido del nombre del repositorio en línea de donde copiaremos los archivos (origin) y luego el nombre de la rama de nuestro repositorio local donde deseamos que se copien (master)." |
| 1115 | + "It's good for you to always work with the most recent version of your repository, that's why before anything else you should always update your local repository because maybe someone from your team has made an important change", |
| 1116 | + "In order to update our local repository, we use <strong>git pull</strong> followed by the online repository we will copy our files from (origin) and then the name of our local repository branch where we want them to be copied to (master)." |
1117 | 1117 | ], |
1118 | 1118 | "comando": "git pull origin master", |
1119 | 1119 | "alert": "Did not use git pull", |
|
1134 | 1134 | "mi_plan.txt" |
1135 | 1135 | ], |
1136 | 1136 | "commits": [ |
1137 | | - "20b5ccd - Agregar mi_plan.txt", |
1138 | | - "3852b4d - Agregar todos los archivos de texto", |
1139 | | - "7d8d808 - Editar frecuencia de reuniones en mi_plan.txt" |
| 1137 | + "20b5ccd - Added mi_plan.txt", |
| 1138 | + "3852b4d - Added all the text files", |
| 1139 | + "7d8d808 - Edit meeting frequency in mi_plan.txt" |
1140 | 1140 | ] |
1141 | 1141 | } |
1142 | 1142 | }, |
|
0 commit comments