![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-14-320.jpg)
![??? ??? ?? ???
$ git rebase Ci [<?? ??>]](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-46-320.jpg)
![??? ??? ?? ???
$ git rebase Ci [<?? ??>]](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-47-320.jpg)
![?? ??? ??
? $ git stash list
? $ git stash apply [<stash>]
? $ git stash drop [<stash>]](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-56-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-59-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-97-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-105-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-106-320.jpg)
![git lg
? ?? ???? ??? ???? alias
[alias]
lg = log --graph --abbrev-commit --decorate --date=relative
--format=format:'%C(bold red)%h%C(reset) - %C(bold
green)(%ar)%C(reset) %C(white)%s%C(reset) %C(cyan)<%an>%C(res
et)%C(bold yellow)%d%C(reset)' --all](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-107-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-108-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-120-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-136-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-176-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-177-320.jpg)
![[NDC16] Effective Git](https://image.slidesharecdn.com/effectivegit-160428075751/85/NDC16-Effective-Git-178-320.jpg)
[NDC16] Effective Git
- 1. Effective Git ?? ??? ? ???? ???
- 2. ??
- 3. ??? ? 2010-2014.3 <?????> ? 2014.3-2014.11 <Project N> ? 2014.12- <??? ?: ???> ? KGC14 <????? ?????> ? NDC15 <????? ? ????> ? NDC16 <Find My AndPhone> ? NDC16 <Effective Git> kexplo http://chanwoong.kim cwkim@nexon.co.kr kexplo
- 4. ?? ??
- 5. Git ????? ?? ? ??? ???? VCS? ???? ?? ? ?? VCS? ???? ???? ?? ? svn checkout ★ git clone ? svn update ★ git pull ? svn commit ★ git commit
- 6. ? ???? ?? ?? ? ???? ?? ????? ?? ? Git? ?? ?? ???? ??! ? http://d.hatena.ne.jp/gu_he_he/20120322/1332419643 ?? Git ?? ????
- 7. ??? ?? Git ??? ??? push, commit ??? ???? ??? ?? ??? ?? ???? ?? ?? ?? ?? ?
- 8. ?? ???? ?? ??? ? ???? ? git? command line?? ?? ?? ? ? GUI ?? ?? ?? ? Staging area ? ?? ???? ?
- 9. ?? ?? ??? ? ?? Git ??? ? ??? Git? ???, Git? ?? ?? ?? ????? ´ ? Git ?? ?? ? blob, tree object, commit object, ´ ? ?? ??? ??? ???´
- 10. ?? ? ??? ? Git ?? ?? ? Rebase ? ?? ??? ? ?? 16?? ?? ?? ? 3?? ??? ???? ?? ? ??? ?? ??
- 11. ?? ? ??? ? Git ?? ?? ? Rebase ? ?? ??? ? ?? 16?? ?? ?? ? 3?? ??? ???? ?? ? ??? ?? ?? 1. ??? ??? 2. ?? ???? 3. ?? ????
- 12. Git ?? ?? git flow Forward-porting
- 13. Branching, Merge? ?? ?? ??? ?? == ?? ?? ??
- 16. Git-flow ??? ?? ? Vincent Driessen? ?? ? ??? ?? ???? ???? ?? ? master branch: ?? ?? ? develop branch: ?? ?? ? ??? ?? ??? ? ??? ?? ?? ? Git-flow? ???? ??, ??? ??/??? ?? ? ?
- 17. ? ?? ?? develop
- 18. ? ?? ?? develop feature/awesome $ git flow feature start awesome $ git commit -a $ git commit -a $ git commit -a
- 19. ? ?? ?? develop feature/awesome $ git flow finish awesome
- 20. ? ?? develop
- 21. ? ?? develop release/v1.0.0 $ git flow release start v1.0.0 $ git commit -a $ git commit -a $ git commit -a
- 22. ? ?? develop $ git flow release finish v1.0.0 master tag v1.0.0
- 24. ? ?? master hotfix/fix1 $ git flow hotfix start fix1 $ git commit -a $ git commit -a $ git commit -a
- 25. ? ?? master $ git flow hotfix finish fix1 develop tag fix1 hotfix/fix1
- 26. ? ?? develop feature/awesome release/v1.0.0 master feature release hotfix tag v1.0.0 hotfix/fix1 tag fix1
- 27. ? ?? develop feature/awesome release/v1.0.0 master feature release hotfix tag v1.0.0 hotfix/fix1 tag fix1
- 28. ? ?? develop feature/awesome release/v1.0.0 master feature release hotfix tag v1.0.0 hotfix/fix1 tag fix1
- 29. ? ?? develop feature/awesome release/v1.0.0 master feature release hotfix tag v1.0.0 hotfix/fix1 tag fix1
- 30. ?? ? ??? ?? ? feature ★ develop ?? ?? == ??? ??? ??? ? ?? ??? feature branch? ???? ?? ??? ??? ?? ? ?? ?? ? ???? ??? ??? ?? ??? Hook?? ?? ?? ? hotfix ??? ?? ??
- 33. feature/blahblah $ git pull --rebase origin/master origin/master Forward-porting master
- 34. feature/b origin/master Forward-porting $ git pull --rebase origin/master master
- 35. ?? ? ?? ???? ??? ?? ? ?? ??? ?? ??? ?? ? ???? ?? ???? ??? ?.. ? ?? ??? ?? ???? ??, ?? ?? ? ?? ?? ?? ? ? ??? ??? ??? ? ? ?? ? ?? ??? ??? ?? ? ??? ??? ? ?? ??? ?? ??? ???? ???? OK
- 36. ? ??????? ? Git-flow ? release ???? Hook? ?? ? ??? ???? ?? ??, ???, ?? ? Forward-porting ? ?? ???? ??? ??? ? ?? ?? ?? ? ?? ?? ?, ??? ??? ???(?)? ?? ??
- 37. Rebase rebase ?? ?? ?? ????
- 39. Rebase ? Base? ???(Re-)?? ?? ? Forward-porting? Rebase? ??? ?? ? Rebase? ?? base? ?? ?? ?? ???? ??
- 40. B C D feature/abc E FA develop HEAD
- 41. B C D feature/abc E FA develop $ git checkout feature/abc $ git rebase develop HEAD
- 42. B C D feature/abc E FA develop ?? ??? ?? HEAD
- 43. B C D feature/abc E FA develop ????? ? ???? ??? ??? ? HEAD B C D
- 44. B` C` D` feature/abc E FA develop ?? ???? ?? HEAD B C D B C D
- 46. ??? ??? ?? ??? $ git rebase Ci [<?? ??>]
- 47. ??? ??? ?? ??? $ git rebase Ci [<?? ??>]
- 48. Rebase? ?? ??? ?? ???? ??? ??, ??? ???? ??? ? ??.
- 49. 16?? ?? ?? 1. ??? ??? 2. ?? ???? 3. ?? ????
- 50. 1. ??? ??? stash bisect blame worktree Hunk ?? ???? ?? ??? ?? ???? alias shallow clone 2. ?? ???? 3. ?? ????
- 51. $ git stash save Pop Apply List drop stash bise bla workt Hunk ??? ali shall
- 52. ?? ? ???? ? ?? ???? ? ? ?? A? ?? ???, ?? B? ?? ? ????? ? ABC
- 53. stash? ?? ?? ????? ?? ?? ?? stash stack? ?? ???. WIP WIP stash Working Directory git stash save git stash pop
- 54. ??? ? ?? ?? ?? ?? ?? ?? ? ??? ??? ?? ? ? ?? ?? ?? ???
- 55. git stash ? ?? ?? ?? ?? ?? ?? ? $ git stash save ? ??? ??? ?? ? ? ?? ?? ?? ??? ? $ git stash pop
- 56. ?? ??? ?? ? $ git stash list ? $ git stash apply [<stash>] ? $ git stash drop [<stash>]
- 57. $ git bisect start good bad log reset bisect sta bla workt Hunk ??? ali shall
- 58. ?? ? ?? ?? ??? ????. ? ???? ? ?? ???? ? ?? ??? ?? ??? ?? ? ???? ??? ??? ?? ? http://ff663.blogspot.kr/2010/05/201058- in-english-i-feel-complete.html
- 60. bisect? ??? ?? ??? ??? ??? ?? ?? ?? ??.
- 61. HEAD
- 62. $ git bisect start HEAD
- 63. $ git bisect start $ git bisect bad HEAD
- 64. $ git bisect start $ git bisect bad $ git bisect good f794027 f794027 HEAD
- 65. f794027 HEAD
- 66. $ git bisect good f794027 HEAD
- 67. f794027 HEAD
- 68. f794027 HEAD $ git bisect bad
- 69. f794027 HEAD
- 70. f794027 HEAD $ git bisect bad
- 71. f794027 HEAD $ git bisect bad
- 72. ? ? ? $ git bisect log ? $ git bisect reset
- 73. ?.. ??? ????? ? ?? ???! ? ??? ?? ??! (???? ??? ??)
- 74. ? $ git bisect start ? # test_error.sh? ??? ?? ?? 1? ??. ? $ git bisect run test_error.sh
- 75. $ git blame -L <start,end> -C blame sta bise workt Hunk ??? ali shall
- 76. blame ? bisect? ?? ??? ???? ? ?? ???? ?? ??(?)? ? ?? ? ?????
- 77. $ git blame -L 10,11 effective_git.md
- 78. $ git blame -L 10,11 effective_git.md ??? ?? ?? ?? ? ?? ?? ??
- 79. $ git blame -L 10,11 effective_git.md ??? ?? ?? ?? ? ?? ?? ?? -C ??? ?? ??
- 80. $ git worktree add prune list worktree sta bla bise Hunk ??? ali shall
- 81. ?? ? ???? (???) ? ?? ???? ? ? ?? A? ?? ???, ?? B? ?? ? ????? ? ABC
- 82. ?? ? ???? (???) ? ?? ???? ? ? ?? A? ?? ???, ?? B? ?? ? ????? ? ?? ??? ? ? ? ABC
- 83. ?? ??? ?? ? ?? ????? ??? ??? ?? ?? ? ???? ??? ????, ???? ??? ????´ ? stash? ? ???, untracked ??? ? ??´ ? ?? ?? ??? ???? ?? ??
- 84. ?? ??? ?? ? ?? ????? ??? ??? ?? ?? ? ???? ??? ????, ???? ??? ????´ ? stash? ? ???, untracked ??? ? ??´ ? ?? ?? ??? ???? ?? ?? worktree? ?? ?? ?? ??? ??? ? ?? ? ?
- 85. $ git worktree add Cb emergency-fix ../temp master
- 86. $ git worktree add Cb emergency-fix ../temp master ?? ?? ??? ? worktree ?? ? worktree? chekcout? ???
- 87. $ git worktree add Cb emergency-fix ../temp master $ pushd ../temp # ... ? ?? ... $ popd ??? ???? ? ??? ??? ?? ????
- 88. $ git worktree add Cb emergency-fix ../temp master $ pushd ../temp # ... ? ?? ... $ popd $ rm Crf ../temp $ git worktree prune Worktree? ??
- 89. Hunk ??? ?? (｀-p¨ ?? ??) $ git add C沿 $ git checkout C沿 $ git stash -p Hunk??? sta bla workt ??? ali bise shall
- 90. Atomic commit ? ＾(?? ? ??)???? ??Atomic￣? ?? ?? ? ?? VCS??? ???? ?? ? ?? ? ?? ?? ?? ?? ? ?? ?? ??
- 91. ??? ?? ? ?? ?? ? ??? ??? ? ?? ?? ? ? ??. ? ???? ?? ?? ???? ?? ?? ????´
- 92. ??? ?? ? ?? ?? ? ??? ??? ? ?? ?? ? ? ??. ? ???? ?? ?? ???? ?? ?? ????´ ? ?? ? ??? ＾-p￣ ??.
- 93. ?$ git add
- 94. ?$ git add C沿
- 95. ?$ git add C沿
- 96. ?$ git add C沿 ?$ git reset C沿 ?$ git checkout C沿 ?$ git rm -p
- 98. ?? ??? ?? ???? $ git checkout $ git show ????? sta bla workt Hunk ali bise shall
- 99. checkout ? ???? ??? ??? ? ?? ??? ??? ???? ? ?? ???
- 100. $ git checkout master -- Readme.md Readme.md? master ???? ??? checkout
- 101. show ? 1? ??? ????(blob, tree, commit, ´)? ?? ???
- 102. ? $ git show fc1b357:Readme.md > master_Readme.md fc1b367 ??? Readme.md? master_Readme.md? ??
- 104. ?? ??? ????? ? ??? ?? ?? ? git status ★ git st ? ?? ???? ?? ??? ?? ? ? alias? ????.
- 107. git lg ? ?? ???? ??? ???? alias [alias] lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold red)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(cyan)<%an>%C(res et)%C(bold yellow)%d%C(reset)' --all
- 109. shallow clone $ git clone Cdepth $ git fetch --depth $ git fetch --unshallow sallowcl sta bla workt Hunk ??? ali bise
- 110. ??? N? ??? ??? ? ? ?? ???, ??, ?? ?? ´ ? ?? ???? ?? ? ?
- 111. $ git clone
- 112. $ git clone --depth 1
- 113. depth ?? $ git fetch --depth <N>
- 114. Q. Push? ? ??
- 115. Q. Push? ? ?? $ git fetch --unshallow
- 116. 2. ?? ???? 3. ?? ???? git log ??? ???? git log -S ??? ?? ?? git grep git rev-list 1. ??? ???
- 118. ?? ?? $ git log <sha1 hash>
- 119. git log ?? ?? ? ｀/¨ ? ??? ?? ? n, N (search Next) ?? ?? ?? ?? ? Vi ?? j, k? ?, ?? ??
- 121. ??? ???? ^, ~, .., ... ????? gitl ??? gitg gitr git
- 122. ?? ???? ??? ?? ?? ?? ? ?? ??? ? d206ec8 ?? 727372a? ?? ???
- 123. ?? ???? ??? ?? ?? ?? ? ?? ??? ? d206ec8 ?? 727372a? ?? ??? ? ??? ? ? ?.. ???? ?? ?? ? ?? ??? ?? ????
- 124. ?? ???? ??? ?? ?? ?? ? ?? ??? ? d206ec8 ?? 727372a? ?? ??? ? ??? ? ? ?.. ???? ?? ?? ? ?? ??? ?? ????
- 125. ^ (Circumflex) ?^n ? n?? ?? ??? ??? ? n? 1? ?? ?? ?? ( ^1 == ^ )
- 126. HEAD
- 128. HEAD HEAD^^
- 129. HEAD HEAD^^ (HEAD^)^
- 130. ~ (Tilde) ? ~n? n? ? ?? ??
- 131. HEAD
- 132. HEAD HEAD~ HEAD~1
- 135. .. (double dot) ? ??? ?? ? ? start..end : end? ??, start? ? ?? ?? ??
- 137. HEAD~3..HEAD
- 138. ? ???
- 139. B C D JIHGFE A develop..master? ??? ???? (3?) develop master
- 140. B C D JIHGFE A develop..master? ??? ???? (3?) develop master
- 141. .. (double dot) ? ??? ??? ?? ? ? start..end : end? ??, start? ? ?? ?? ??
- 142. .. (double dot) ? ??? ??? ?? ? ? start..end : end? ??, start? ? ?? ?? ?? end?? ??? ? ??, start?? ??? ? ?? ?? end C start ? ???
- 143. B C D JIHGFE A develop master develop..master master?? ??? ? ??, develop?? ??? ? ?? ?? master C develop ? ???
- 144. ... (Triple dot) ? ???? ??? ?? ???? ?? ?? ??? ?? ? ????? A-B B-A $ git log A...B
- 148. git log CS<string> # pickaxe ? ??? Diff ?????? ???? ?? ? ??? ?? ??? ??? ?? ? -M ??? ????, rename??? ??? ? ??.
- 149. ??? ?? ?? git log --follow ???? gitg gitr git ??? gitl
- 150. ??? ? ?? ? ???? ?? ? ??? ??? ???´ ? ??? ? ???
- 151. ???? ??
- 152. $ git log Cfollow -- filepath
- 154. $ git grep ? ??? ?? ?? ? grep? ?? ? blob object ????? ???? ??. ? ??? ??? ? ? ?? ? $ git grep blahblah ? -- ?? ??? ??? ??? ? ?? ? $ git grep blahblah -- Document
- 155. $ git grep hello # -- ?? ??? ??? ??? ? ?? $ git grep hello -- subdirectory
- 157. rev-list ? commit object? ?? ???? ?? ?? ? ?? ??? ?? ??? ? ?? ? ?? ???? ??? ? ? ?? ? ??? ??? ???? ??
- 158. $ git rev-list master -- Readme.md
- 159. rev-list $ git rev-list master -- Readme.md 727372ac234645eeb891272b3fc73c940ea5f52f c38dc4e678d40dd48072489fda6b8f933cdea0c2 1064cea4cfbf8bd94dff3cc3175d5de2ff5c110c 19424a1bff2223c25905c2e732a857911a0d7c54 189952e05d7cc97a7e408480d00c39c8ab754489
- 160. rev-list $ git rev-list Cn 1 master -- Readme.md 727372ac234645eeb891272b3fc73c940ea5f52f
- 161. 3. ?? ???? 1. ??? ??? 2. ?? ???? git reflog git fsck
- 162. Reflog gitreflo gitf
- 163. History log? ??? ? ? ??? ?? ???? ? ??? ??? ?? ??? ? ( $ git commit Camend ) ? ? ??? ?????, ???? ?? ???? ?? ? ? ???
- 164. Commit object? ?? ? $ git commit --amend ? ?? ? ??? ??? ?. (sha1 hash ?? ???)
- 165. B C DA
- 166. B C DA $ git commit --amend D`
- 167. $ git commit --amend B C DA D` ?? ??? dangling commit? ??? ??? ?? ? GC? ?? ??? ?? ??
- 168. ?? Push? ? ??? ??? ?? ? Reflog? ??? ????? ??? ?
- 169. ?? Push? ? ??? ??? ?? ? Reflog? ??? ????? ??? ? ?? push Cf ? ???? ?? ?????.
- 170. 1. ??? ?? ???(?) ??? ??? 2. hash ? HEAD@{1} ?? ref? HEAD? ??? ?? $ git reset HEAD@{2} ??
- 171. ? ???
- 172. fsck gitfsck gitr
- 173. dangling commit ? ??? ref? ??? ??? ? ?? ?? B C DA D` HEAD
- 174. dangling commit ?? $ git fsck
- 179. ?? ? https://git-scm.com/doc ? http://danielkummer.github.io/git-flow-cheatsheet/index.html ? https://www.sourcetreeapp.com/ ? https://www.gitkraken.com/ ? https://about.gitlab.com/