Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Agrego página git diff #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 14, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
agrego página git diff
  • Loading branch information
eamanu committed May 26, 2020
commit 92794805575657afc9d99ec7f5512a4294b0af75
36 changes: 36 additions & 0 deletions .overrides/git_diff.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
:orphan:

=========================
Simplificar el `git diff`
=========================

El comando `git diff` tiene datos que pueden llegar a ser inútiles como por ejemplo:

.. code-block:: diff

-#: ../Doc/library/signal.rst:406
+#: ../Doc/library/signal.rst:408

Para ellos debemos instalar brew. Si no lo tienes instalado puedes seguir el instructivo de instalación Brew_.

Una vez instalado brew, hay que instalar podiff, para ellos ejectar el siguiente comando:

.. code-block:: bash

brew install pdiff

Luego abrir el archivo de configuración del respositorio local y escribir al final:

.. code-block:: bash

[diff "podiff"]
command = $(brew --prefix)/bin/podiff -D--minimal

Luego, si no existiese el archivo `.gitatributes` en la carpeta dónde se encuentran los
archivos .po con los que se van a trabajar, crealo, y luego, agregar la siguiente línea

.. code-block:: bash

*.po diff=podiff

.. _Brew: https://docs.brew.sh/Installation