Dos puntos vs tres puntos

La sintaxis más confundida en Git: .. vs ... en git diff y git log. Significan cosas diferentes en comandos diferentes.

Para git log

git log main..feature      # commits en feature pero no en main
git log main...feature     # commits en cualquiera, pero no en ambos

Para git diff

git diff main..feature     # diff entre los tips
git diff main...feature    # diff entre merge-base y tip de feature

El patrón de review de PR

git diff main...feature/oauth

Listar commits en un branch

git log main..feature --oneline
git log feature --not main --oneline
git rev-list main..feature

Mostrar commits únicos a cada lado

git log --left-right --oneline main...feature
# < sha1 commit solo en main
# > sha2 commit solo en feature

Vista general de stat

git diff --stat main..feature
git diff --shortstat main...feature

Diff de archivos específicos

git diff main..feature -- src/checkout.js
git diff main...feature -- 'src/**'

Comparar entre remotes

git fetch origin
git diff origin/main...origin/feature

Herramientas para comparación más rica

git difftool main...feature
git range-diff main..v1 main..v2
gh pr diff 123

Vistas a nivel de palabra y stat

git diff --word-diff main...feature
git diff --color-words main...feature
git diff --numstat main..feature