Skip to content

Update with Insight #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pismute merged 1 commit into from
Nov 20, 2015
Merged

Update with Insight #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions book/02-git-basics/sections/recording-changes.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,9 +498,6 @@ index 0000000..03902a1
+++ b/README
@@ -0,0 +1,4 @@
+My Project
+
+ This is my project and it is amazing.
+
----

//////////////////////////
Expand Down Expand Up @@ -592,7 +589,7 @@ Run `git difftool --tool-help` to see what is available on your system.
.외부 도구로 비교하기
====
이 책에서는 계속 `git diff` 명령으로 여기저기서 써 먹는다.
새끈하게 보여주거나 선호하는 Diff 도구가 있으면 사용할 수 있다.
즐겨 쓰거나 결과를 아름답게 보여주는 Diff 도구가 있으면 사용할 수 있다.
`git diff` 대신 `git difftool` 명령을 사용해서 emerge, vimdiff 같은 도구로 비교할 수 있다. 상용 제품도 사용할 수 있다.
`git difftool --tool-help`라는 명령은 사용가능한 도구를 보여준다.
====
Expand Down
10 changes: 5 additions & 5 deletions book/02-git-basics/sections/undoing.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,21 @@ Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

renamed: README.md -> README
modified: benchmarks.rb
modified: CONTRIBUTING.md
----

//////////////////////////
Right below the ``Changes to be committed'' text, it says use `git reset HEAD <file>...` to unstage.
So, let's use that advice to unstage the `benchmarks.rb` file:
So, let's use that advice to unstage the `CONTRIBUTING.md` file:
//////////////////////////
`Changes to be commited` 밑에 `git reset HEAD <file>...` 메시지가 보인다.
이 명령으로 Unstated 상태로 변경할 수 있다. benchmarks.rb 파일을 Unstated 상태로 변경해보자.
이 명령으로 Unstated 상태로 변경할 수 있다. `CONTRIBUTING.md` 파일을 Unstated 상태로 변경해보자.

[source,console]
----
$ git reset HEAD benchmarks.rb
$ git reset HEAD CONTRIBUTING.md
Unstaged changes after reset:
M benchmarks.rb
M CONTRIBUTING.md
$ git status
On branch master
Changes to be committed:
Expand Down