-- -- start file arguments
-b -- create a new branch based at given commit
-B -- create or update branch based at given commit
--conflict -- same as --merge, using given merge style
--force -f -- force branch switch/ignore unmerged entries
--merge -m -- 3way merge current branch, working tree and new branch
--no-track -- override the branch.autosetupmerge configuration variable
--orphan -- create a new orphan branch based at given commit
--ours -- check out stage #2 for unmerged paths
--patch -p -- interactively select hunks in diff between given tree-ish a
--quiet -q -- suppress feedback messages
--theirs -- check out stage #3 for unmerged paths
--track -t -- set up configuration so pull merges from the base commit
git clean -f
(-d
si vous avez un nouveau répertoire)git reset --hard
( ougit reset
puis retour à 1. )git checkout .
(ou précisez avec les noms de fichiers)git reset --hard
( ougit reset
puis retour à 3. )git clean -f
git checkout -f
git checkout -f
ougit checkout .
git checkout -f
git status -s | awk ' = "?" { print }' | xargs rm -v
git reset --hard
git reset --hard
git reset --hard