SSS Git 강의 슬라이드 자료 (2/4)

3. git diff
• git diff [--options] [--] [<path>…]

4. git diff --cached
• git diff [--options] --cached [<commit>] [--] [<path>…]

5. git diff <commit>
• git diff [--options] <commit> [--] [<path>…]

6. git diff <commit1> <commit2>
• git diff [--options] <commit1> <commit2> [--] [<path>…]

7. • --word-diff
[-…-], {+…+}
• --word-diff=color
• --color-words
--word-diff=color

8. git log -p

9. git commit --amend
• git add more-file
• git commit --amend -m “edited commit”

10. git checkout
• git checkout master
• git checkout <commit>
<commit>
• git checkout <commit> <file>
<file> <commit>

11. git checkout hello.c aj78su7

12. git reset
• git reset <file>
• git reset
• git reset <commit>
• git reset ORIG_HEAD
--hard

13. git reset d2h8ffs

14. git reset --hard
• git reset --hard
• git reset --hard <commit>
• git reset --hard ORIG_HEAD
--hard

15. git revert
• git revert <commit>

16. 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!”);
- }