Skip to content

Commit

Permalink
Update git.md
Browse files Browse the repository at this point in the history
  • Loading branch information
jgvictores authored Jan 7, 2018
1 parent fc699c0 commit 0e8ee18
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion software/version-control/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- Deshacer los cambios de un fichero (antes de commit): [git checkout -- nombre-fichero](https://git-scm.com/docs/git-checkout#git-checkout-emgitcheckoutemlttree-ishgt--ltpathspecgt82308203)
- Corregir el texto del último commit (antes de push, aunque se podría forzar): [git commit --amend](https://git-scm.com/docs/git-commit#git-commit---amend)
- Deshacer el útimo commit entero (antes de push, aunque se podría forzar): [git reset HEAD~1](https://git-scm.com/docs/git-reset#git-reset-emgitresetemltmodegtltcommitgt)
- Ver differencias por palabras en lugar de líneas (probado también con `git show`): `git diff --word-diff=color --word-diff-regex=.`
- Ver differencias por palabras en lugar de líneas (probado también con `git show`): [git diff --word-diff=color --word-diff-regex=.](https://stackoverflow.com/questions/1721738/using-diff-or-anything-else-to-get-character-level-diff-between-text-files)

## Git Log Visualization
- gitk
Expand Down

2 comments on commit 0e8ee18

@PeterBowman
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Git offers fine-grained control over diff visualization (among other things) on a per-repository basis, see https://git-scm.com/docs/gitattributes#_generating_diff_text.

@jgvictores
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting. I've opened #11 to remember this before it gets lost between emails. :-)

Please sign in to comment.