|
811 | 811 | "tareas": [ |
812 | 812 | "The output of the <strong>git status</strong> command is telling us that <strong>mi_plan.txt</strong> is <strong>untracked</strong>", |
813 | 813 | "This means that the new file has not yet been added to the Git tracking process", |
814 | | - "To have Git to track this file, type the command <strong>git add [nombre del archivo]</strong>. This process is called <strong>Staging</strong> (meaning our changes are ready to be commited" |
| 814 | + "To have Git to track this file, type the command <strong>git add [nombre del archivo]</strong>. This process is called <strong>Staging</strong>, or moving files to the <strong>Staging index tree</strong>, meaning our changes are ready to be committed" |
815 | 815 | ], |
816 | 816 | "comando": "git add mi_plan.txt", |
817 | 817 | "alert": "Did not add mi_plan.txt", |
|
862 | 862 | }, |
863 | 863 | "6": { |
864 | 864 | "orden": "6", |
865 | | - "titulo": "Commiting your staged changes", |
866 | | - "tituloCorto": "Commiting changes", |
| 865 | + "titulo": "Committing your staged changes", |
| 866 | + "tituloCorto": "Committing changes", |
867 | 867 | "tareas": [ |
868 | 868 | "Now that our changes are <strong>Staged</strong>, we are ready to <strong>commit</strong> the changes.", |
869 | | - "<strong>Commit</strong> means simply to that our <strong>Staged</strong> changes are ready to be added to our repository. If you wish, you can add or remove files and <strong>Stage</strong> them as necessary before commiting the changes", |
| 869 | + "<strong>Commit</strong> means simply to that our <strong>Staged</strong> changes are ready to be added to our repository. If you wish, you can add or remove files and add them to the <strong>Staging index</strong> them as necessary before committing the changes", |
870 | 870 | "To save the changes in our repository, use the command <strong>git commit -m</strong> followed by a commit message that briefly states what exactly happened in between the last version and this. In this case, we added a new archive in an empty repository, so the commit message will be simple: <i>Added mi_plan.txt</i> (enclosed in double quotes)." |
871 | 871 | ], |
872 | 872 | "comando": "git commit -m \"Added mi_plan.txt\"", |
|
890 | 890 | }, |
891 | 891 | "7": { |
892 | 892 | "orden": "7", |
893 | | - "titulo": "Agregando varios archivos", |
894 | | - "tituloCorto": "Agregando varios archivos", |
| 893 | + "titulo": "Adding multiple files", |
| 894 | + "tituloCorto": "Adding multiple files", |
895 | 895 | "tareas": [ |
896 | | - "Nuestro repositorio ya tiene un commit. Pero ahora, imagina que has estado trabajando todo el día en tu proyecto y has terminado creando varios archivos de texto. Usar el comando <strong>git add</strong> para agregarlos uno a uno es bastante fastidioso, ¿verdad? Pues Git nos ofrece un metodo un poco más comodo.", |
897 | | - "Para ello usaremos el comando <strong>git add \"*.txt\"</strong> el cual agregará todos los archivos de texto que hayan sido editados en nuestro repositorio." |
| 896 | + "Our repository already has one commit. But what if you have been working all day in this project, and now you have a few new text files to commit? Adding them one by one with the <strong>git add</strong> command is quite tedious, right? No worries, Git has a better method to add multiple files.", |
| 897 | + "Type the command <strong>git add \"*.txt\"</strong>, in order to add all the text tiles that have been added or edited in our repository." |
898 | 898 | ], |
899 | 899 | "comando": "git add \"*.txt\"", |
900 | 900 | "alert": "Did not use git add", |
901 | 901 | "successMessages": [ |
902 | | - "<span class=\"success\">Archivos agregados</span>" |
| 902 | + "<span class=\"success\"Added files</span>" |
903 | 903 | ], |
904 | 904 | "repoStatus": { |
905 | 905 | "branch": "master", |
|
916 | 916 | "reuniones_del_mes.txt" |
917 | 917 | ], |
918 | 918 | "commits": [ |
919 | | - "20b5ccd - Agregar mi_plan.txt" |
| 919 | + "20b5ccd - Adding mi_plan.txt" |
920 | 920 | ] |
921 | 921 | } |
922 | 922 | }, |
923 | 923 | "8": { |
924 | 924 | "orden": "8", |
925 | | - "titulo": "Revertir el Stage", |
| 925 | + "titulo": "Revert to Stage", |
926 | 926 | "tituloCorto": "Git reset", |
927 | 927 | "tareas": [ |
928 | | - "Así como <strong>git add</strong> envía tus archivos editados al <strong>Stage</strong>, existe el comando <strong>git reset</strong> que hace todo lo contrario. Retira los archivos del <strong>Stage</strong>.", |
929 | | - "Este comando puede recibir los mismos argumentos que hemos visto hasta ahora con <strong>git add</strong>.", |
930 | | - "Probemos retirando los archivos de texto que acabamos de agregar al <strong>Stage</strong>." |
| 928 | + "We know that the <strong>git add</strong> command sends edited files to the <strong>Staging index</strong>. The command <strong>git reset</strong> does the the exact opposite: It reverts to the previous state of <strong>Stage</strong>.", |
| 929 | + "This command accepts the same arguments as <strong>git add</strong>.", |
| 930 | + "Let's try to reset the last files we added to <strong>Stage</strong>." |
931 | 931 | ], |
932 | 932 | "comando": "git reset", |
933 | 933 | "alert": "Did not use git reset", |
934 | 934 | "successMessages": [ |
935 | | - "<span class=\"success\">Los archivos de texto ya no están en el <strong>Stage</strong></span>" |
| 935 | + "<span class=\"success\">Text files were removed from <strong>Stage</strong></span>" |
936 | 936 | ], |
937 | 937 | "repoStatus": { |
938 | 938 | "branch": "master", |
|
944 | 944 | "mi_plan.txt" |
945 | 945 | ], |
946 | 946 | "commits": [ |
947 | | - "20b5ccd - Agregar mi_plan.txt" |
| 947 | + "20b5ccd - Adding mi_plan.txt" |
948 | 948 | ] |
949 | 949 | } |
950 | 950 | }, |
951 | 951 | "9": { |
952 | 952 | "orden": "9", |
953 | | - "titulo": "Agregando archivos de nuevo", |
| 953 | + "titulo": "Adding files again", |
954 | 954 | "tituloCorto": "Git add #2", |
955 | 955 | "tareas": [ |
956 | | - "Como podrás notar nuestros archivos de texto ya no están en en la zona de preparación.", |
957 | | - "Ahora, volvamos a agregarlos." |
| 956 | + "As you see on the right panel, our files are not anymore on the <strong>Staging index</strong>.", |
| 957 | + "Let's add them again." |
958 | 958 | ], |
959 | 959 | "comando": "git add \"*.txt\"", |
960 | 960 | "alert": "Did not use git add", |
961 | 961 | "successMessages": [ |
962 | | - "<span class=\"success\">Archivos agregados</span>" |
| 962 | + "<span class=\"success\">Added files</span>" |
963 | 963 | ], |
964 | 964 | "repoStatus": { |
965 | 965 | "branch": "master", |
|
976 | 976 | "reuniones_del_mes.txt" |
977 | 977 | ], |
978 | 978 | "commits": [ |
979 | | - "20b5ccd - Agregar mi_plan.txt" |
| 979 | + "20b5ccd - Adding mi_plan.txt" |
980 | 980 | ] |
981 | 981 | } |
982 | 982 | }, |
983 | 983 | "10": { |
984 | 984 | "orden": "10", |
985 | | - "titulo": "Volviendo a hacer commit", |
986 | | - "tituloCorto": "Haciendo commit #2", |
| 985 | + "titulo": "Committing newly staged changes", |
| 986 | + "tituloCorto": "Committing files #2", |
987 | 987 | "tareas": [ |
988 | | - "Hagamos un commit con los nuevos cambios.", |
989 | | - "¿Qué te parece usar el mensaje <em>Agregar todos los archivos de texto</em>?" |
| 988 | + "Let's commit our newly staged changes.", |
| 989 | + "How about adding a more descriptive commit message, such as <em>Added all text files</em>?" |
990 | 990 | ], |
991 | | - "comando": "git commit -m \"Agregar todos los archivos de texto\"", |
| 991 | + "comando": "git commit -m \"Added all text files\"", |
992 | 992 | "alert": "Did not use git commit", |
993 | 993 | "successMessages": [ |
994 | 994 | "[master (root-commit) 3852b4d]", |
995 | | - "'Agregar todos los archivos de texto'", |
| 995 | + "'Added all text files'", |
996 | 996 | "3 file changed, 3 insertion(+)", |
997 | 997 | "create mode 100644 desarrollo.txt", |
998 | 998 | "create mode 100644 maquetado.txt", |
|
1009 | 1009 | "mi_plan.txt" |
1010 | 1010 | ], |
1011 | 1011 | "commits": [ |
1012 | | - "20b5ccd - Agregar mi_plan.txt", |
1013 | | - "3852b4d - Agregar todos los archivos de texto" |
| 1012 | + "20b5ccd - Added mi_plan.txt", |
| 1013 | + "3852b4d - Added all text files" |
1014 | 1014 | ] |
1015 | 1015 | } |
1016 | 1016 | }, |
|
0 commit comments