3 results
tagged
revert x
-
Note: "revert" à la main pour revenir a l'état d'un commit dans le passé
9 juin 2020 à 14:04:13 UTC+2 - permalink -git reset --hard past_commit
git reset current_commit
git commit
-
https://links.infomee.fr/?gfxj6Q
-
git - How to revert a merge commit that's already pushed to remote branch? - Stack Overflow
10 novembre 2016 à 14:00:22 UTC+1 - permalink -The -m option specifies the parent number. This is because a merge commit has more than one parent, and Git does not know automatically which parent was the mainline, and which parent was the branch you want to un-merge.
When you view a merge commit in the output of git log, you will see its parents listed on the line that begins with Merge:
commit 8f937c683929b08379097828c8a04350b9b8e183
Merge: 8989ee0 7c6b236
Author: Ben James ben@example.com
Date: Wed Aug 17 22:49:41 2011 +0100Merge branch 'gh-pages'
Conflicts:
READMEIn this situation, git revert 8f937c6 -m 1 will get you the tree as it was in 8989ee0, and git revert -m 2 will reinstate the tree as it was in 7c6b236.
-
http://stackoverflow.com/questions/7099833/how-to-revert-a-merge-commit-thats-already-pushed-to-remote-branch