-
Notifications
You must be signed in to change notification settings - Fork 396
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
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6bed747
add .gitattribute
eamanu cf504b6
add .gitattributes
eamanu 9279480
agrego página git diff
eamanu 70135fa
remove .gitattribute
eamanu f8747f7
add tab according to Mac and linux
eamanu 847233f
Merge branch '3.8' into fix-82
eamanu 47d03f8
Quito instlaacion de brew en linux y agrego recomendaciones de podiff…
eamanu 33aee84
Fix code-block
eamanu a48986b
Fix code-block again
eamanu ecb65b0
Update .overrides/git_diff.rst
eamanu 5f057b9
Agrego salto de linea
eamanu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
agrego página git diff
- Loading branch information
commit 92794805575657afc9d99ec7f5512a4294b0af75
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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_. | ||
eamanu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
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 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.