Recettes

Annuler les résultats d'un conflit causé par git stash

To unstage the merge conflicts

$ git reset HEAD .

To save the conflicted merge (just in case)

$ git stash

To return to master

$ git checkout master

To pull latest changes

$ git fetch upstream; git merge upstream/master

To correct my new branch

$ git checkout new-branch; git rebase master

To apply the correct stashed changes (now 2nd on the stack)

$ git stash apply stash@{1}

Supprime la branche locale

$ git branch -d ma-branche

Supprime la branche distante.

$ git push origin --delete ma-branche

Recupere toutes les modifications depuis un commit.

$ git cherry-pick -n <commit-hash>

Effectuer toutes les modifications necessaires...

$ git checkout HEAD <path>

$ git commit ...