Vertaling van "run git diff" in Spaans
We konden deze vermelding niet vinden. Er worden benaderende resultaten weergegeven. Controleer je spelling of stel voor deze term aan het woordenboek toe te voegen.
If you run git diff -u with such mixed changes, you can see the mess for yourself.
If we want to see how the result of the merge differed from what was on their side, you can run git diff - theirs.
Si queremos ver cómo el resultado de la fusión difiere de lo que estaba del otro lado, puedes correr git diff - theirs.
When you run git diff directly after a merge conflict, it will give you information in a rather unique diff output format.
Cuando corres directamente git diff después de un conflicto de fusión, te dará la información en un formato de salida diff bastante único.
If you replace an image in your project and run git diff, you see something like this
If you run git diff on that, you see something interesting
Git provides an easy way to check for this - before you commit, run git diff - check, which identifies possible whitespace errors and lists them for you.
Git proporciona una manera fácil de verificar esto: antes de comprometerse, ejecute git diff - check, que identifica posibles errores de espacio en blanco y los enumera por usted.
Now if you go back into the main project and run git diff - submodule you can see that the submodule was updated and get a list of commits that were added to it.
Si desea buscar trabajo nuevo en un submódulo, puede acceder al directorio y ejecutar Ahora, si vuelve al proyecto principal y ejecuta git diff - submodule puede ver que el submódulo se actualizó y obtener una lista de commits que se le agregaron.
Since Git stages any merge results that are successful, when you run git diff while in a conflicted merge state, you only get what is currently still in conflict.
Dado que las etapas de Git clasifican los resultados que tienen éxito, cuando corres git diff mientras está en un estado de conflicto de fusión, solo puedes obtener lo que está actualmente en conflicto.
If you replace an image in your project and run git diff, you see something like Height: 827
If you run git diff you can get the SHA-1s of the commits recorded in both branches you were trying to merge.
Si ejecuta git diff, puede obtener los SHA-1 de las commits registradas en ambas ramas que estaba intentando fusionar.
If you replace an image in your project and run git diff, you see something like Height: 827 Bit Depth: 8 Color Type: RGB with Alpha
Run git diff > to create a patch.
Ejecuta git diff > para crear un parche.