git - Comment puis-je réconcilier HEAD détaché avec master/origin

92

git branch temp git checkout temp 

git log --graph --decorate --pretty=oneline --abbrev-commit master origin/master temp git diff master temp git diff origin/master temp 

git branch -f master temp git checkout master 

git branch -d temp 

git push origin master 

84

git checkout master 

git checkout -b temp git checkout -B master temp 

79

git rebase HEAD master 

66

git branch 

git branch -a 

* (no branch) master branch1 

git merge HEAD@{1}