yannic/blog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Note GIT

Browse source
This commit is contained in:
Yax 2023-05-17 14:11:35 +02:00
parent 7348458893
commit d899d9d9ce
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
notes/git.md
View file

@ -79,10 +79,22 @@ Lister les commits manquants sur la branche release par rapport à develop
# la version one-liner
git log --oneline --graph --decorate --abbrev-commit release..develop
Créer un patch à partir du dernier commit
git format-patch -1 HEAD
Créer un patch à partir d'un id de commit
git format-patch -1 <sha>
Créer un patch à partir d'une suite de commits consécutifs
git format-patch cc1dde0dd^..6de6d4b06 --stdout > foo.patch
Extraire un diff d'un commit
git diff <sha>^ <sha> > stash.diff
Restaurer un fichier pendant une phase de merge
git checkout -m FILE