= git diff[tool]
{{tag>git}}
== básicos
<code bash; mostrar diferencias entre working area y último commit>
git diff @ # @ = HEAD
</code>

<code bash; mostrar ficheros cambiados respecto a un commit>
git show --stat --oneline <commit-id>
git diff-tree --no-commit-id --name-only -r <commit-id>
</code>

== configuración difftool
<code bash>
#git config --global merge.tool kdiff3
#git config --global mergetool.kdiff3.path "/usr/bin/kdiff3"
#git config --global mergetool.kdiff3.trustExitCode false

git config --global --add diff.guitool kdiff3
git config --global difftool.kdiff3.path "/usr/bin/kdiff3"
git config --global difftool.kdiff3.trustExitCode false
</code>

<code properties; .gitignore>
[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    path = /usr/bin/kdiff3
    trustExitCode = false
    
[diff]
    guitool = kdiff3
[difftool "kdiff3"]
    path = /usr/bin/kdiff3
    trustExitCode = false
</code>
/via: [[https://stackoverflow.com/questions/33308482/git-how-configure-kdiff3-as-merge-tool-and-diff-tool]]

== more
  * [[https://git-scm.com/docs/diff-format]]
  * [[https://git-scm.com/docs/git-diff]]