git&github 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기
TRANSCRIPT
![Page 2: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/2.jpg)
![Page 3: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/3.jpg)
git diff
• git diff [--options] [--] [<path>…]
![Page 4: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/4.jpg)
git diff --cached
• git diff [--options] --cached [<commit>] [--] [<path>…]
![Page 5: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/5.jpg)
git diff <commit>
• git diff [--options] <commit> [--] [<path>…]
![Page 6: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/6.jpg)
git diff <commit1> <commit2>
• git diff [--options] <commit1> <commit2> [--] [<path>…]
![Page 7: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/7.jpg)
• --word-diff
[-…-], {+…+}
• --word-diff=color
• --color-words
--word-diff=color
![Page 8: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/8.jpg)
git log -p
![Page 9: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/9.jpg)
git commit --amend
• git add more-file
• git commit --amend -m “edited commit”
![Page 10: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/10.jpg)
git checkout• git checkout master
• git checkout <commit>
<commit>
• git checkout <commit> <file>
<file> <commit>
![Page 11: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/11.jpg)
git checkout hello.c aj78su7
![Page 12: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/12.jpg)
git reset • git reset <file>
• git reset
• git reset <commit>
• git reset ORIG_HEAD
--hard
![Page 13: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/13.jpg)
git reset d2h8ffs
![Page 14: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/14.jpg)
git reset --hard• git reset --hard
• git reset --hard <commit>
• git reset --hard ORIG_HEAD
--hard
![Page 15: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/15.jpg)
git revert
• git revert <commit>
![Page 16: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/16.jpg)
git revert aj78su7
Added OS Version Check + if(OS.getVersion()<7.0){ + System.out.println(“Your OS is too Old!”); + }
Revert “Added OS Version Check” - if(OS.getVersion()<7.0){ - System.out.println(“Your OS is too Old!”); - }
![Page 17: Git&GitHub 를 이용한 버전관리와 협업 - 2.비교하기와 되돌리기](https://reader034.vdocuments.site/reader034/viewer/2022042605/58e8d1fb1a28abb3398b57b1/html5/thumbnails/17.jpg)