Difference between revisions of "Git"

From Wiki
Jump to: navigation, search
(Created page with 'Undo bad merge: <pre> git clone <repo> git checkout <commit_id> git checkout HEAD@{1} . git merge --no-commit master git revert <commit_id> git checkout master test.txt git add …')
 
Line 4: Line 4:
 
git clone <repo>
 
git clone <repo>
 
git checkout <commit_id>
 
git checkout <commit_id>
git checkout HEAD@{1} .
 
 
git merge --no-commit master
 
git merge --no-commit master
 
git revert <commit_id>
 
git revert <commit_id>
git checkout master test.txt
+
git add .
git add test.txt
+
 
git commit
 
git commit
 +
git push
 
</pre>
 
</pre>

Revision as of 21:59, 19 October 2015

Undo bad merge:

git clone <repo>
git checkout <commit_id>
git merge --no-commit master
git revert <commit_id>
git add .
git commit
git push