Skip to content

Commit

Permalink
Merge pull request #87 from Hoto-Cocoa/patch-1
Browse files Browse the repository at this point in the history
Update contributing.asc
  • Loading branch information
pismute authored Feb 23, 2018
2 parents b659f3e + 860000a commit add9929
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion book/05-distributed-git/sections/contributing.asc
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ image::images/small-team-5.png[John의 커밋을 Fetch 한 후 Jessica의 저장
Jessica thinks her topic branch is ready, but she wants to know what she has to merge into her work so that she can push.
She runs `git log` to find out:
//////////////////////////
이제 `orgin/master`와 Merge 할 차례다.
이제 `orgin/master` 와 Merge 할 차례다.
Jessica는 토픽 브랜치에서의 작업을 마치고 어떤 내용이 Merge 되는지 `git log` 명령으로 확인한다.
[source,console]
Expand Down

0 comments on commit add9929

Please sign in to comment.