Deux points versus trois points

La syntaxe la plus confuse en Git : .. versus ... dans git diff et git log.

Pour git log

git log main..feature      # commits dans feature mais pas dans main
git log main...feature     # commits dans l'un, mais pas les deux

Pour git diff

git diff main..feature     # diff entre les tips
git diff main...feature    # diff entre merge-base et tip de feature

Le pattern de review de PR

git diff main...feature/oauth

Lister les commits dans une branche

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

Montrer les commits uniques à chaque côté

git log --left-right --oneline main...feature
# < sha1 commit seulement sur main
# > sha2 commit seulement sur feature

Vue d'ensemble stat

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

Diff de fichiers spécifiques

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

Comparer entre remotes

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

Outils pour comparaison plus riche

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

Vues word-level et stat-level

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