~~Edit~~

160204 파워쉘을 위한 git 명령어 모음

황현동 노트북 git powershell

git 을 항상 sourcetree로만 사용해 왔는데,
쉘에서 특히 파워쉘에서 잘 활용하기 위해서 정리를 해 봤습니다.
(그렇다고 파워쉘 특성이 있는 명령어를 사용한것은 많이 없습니다.
실습에는 도스쉘이나 심지어 bash같은 리눅스쉘도 상관없습니다.)

Pro Git 책에서 자주 사용하는 예제만 골라서 직접 테스트 해봤습니다.
https://play.google.com/store/books/details?id=qaGyAJ0US_kC

좋은 책을 만들어준 scott chacon께 감사드립니다.
무료로 좋은책을 공개해준 google 에도 감사드립니다.

전체 설정 확인

1.PS C:\project\mygittest> git config --list
2.core.symlinks=false
3.core.autocrlf=true
4.color.diff=auto
5.color.status=auto
6.color.branch=auto
7.color.interactive=true
8.help.format=html
9.http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt
10.sendemail.smtpserver=/bin/msmtp.exe
11.diff.astextplain.textconv=astextplain
12.rebase.autosquash=true
13.user.name=Hyundong Hwang
14.user.email=hhd2002@gmail.com
15.core.excludesfile=C:\Users\Hyundong\Documents\gitignore_global.txt
16.core.repositoryformatversion=0
17.core.filemode=false
18.core.bare=false
19.core.logallrefupdates=true
20.core.symlinks=false
21.core.ignorecase=true
22.core.hidedotfiles=dotGitOnly
23.remote.origin.url=https://github.com/HyundongHwang/gittest.git
24.remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
25.branch.master.remote=origin
26.branch.master.merge=refs/heads/master

클론

1.PS C:\project> git clone https://github.com/HyundongHwang/gittest.git .\mygittest\
2.Cloning into '.\mygittest'...
3.remote: Counting objects: 10, done.
4.remote: Total 10 (delta 0), reused 0 (delta 0), pack-reused 10
5.Unpacking objects: 100% (10/10), done.
6.Checking connectivity... done.

현재 상태보기

1.PS C:\project\mygittest> git status
2.On branch master
3.Your branch is up-to-date with 'origin/master'.
4.nothing to commit, working directory clean

서버상태 보기

1.PS C:\project\mygittest> git remote -v
2.origin  git@github.com/HyundongHwang/gittest.git (fetch)
3.origin  git@github.com/HyundongHwang/gittest.git (push)

변경사항 확인

1.PS C:\project\mygittest> git diff
2.diff --git a/dir.txt b/dir.txt
3.index e864d16..65fa135 100644
4.Binary files a/dir.txt and b/dir.txt differ

스테이징 파일 삭제하기

1.PS C:\project\mygittest> git status
2.On branch master
3.Your branch is up-to-date with 'origin/master'.
4.Changes to be committed:
5.  (use "git reset HEAD <file>..." to unstage)
6.
7.        modified:   dir.txt
8.
9.PS C:\project\mygittest> git rm --cached .\dir.txt
10.rm 'dir.txt'
11.PS C:\project\mygittest> git status
12.On branch master
13.Your branch is up-to-date with 'origin/master'.
14.Changes to be committed:
15.  (use "git reset HEAD <file>..." to unstage)
16.
17.        deleted:    dir.txt
18.
19.Untracked files:
20.  (use "git add <file>..." to include in what will be committed)
21.
22.        dir.txt
23.
24.PS C:\project\mygittest>

변경사항 stach 이용하여 무시
그리고 다시 복원

1.PS C:\project\mygittest> git status
2.On branch master
3.Your branch is up-to-date with 'origin/master'.
4.Changes to be committed:
5.  (use "git reset HEAD <file>..." to unstage)
6.
7.        new file:   dir2.txt
8.        new file:   dir3.txt
9.
10.Changes not staged for commit:
11.  (use "git add <file>..." to update what will be committed)
12.  (use "git checkout -- <file>..." to discard changes in working directory)
13.
14.        modified:   dir.txt
15.
16.
17.
18.PS C:\project\mygittest> git stash save
19.Saved working directory and index state WIP on master: 5d4d6d2 test
20.HEAD is now at 5d4d6d2 test
21.
22.
23.
24.PS C:\project\mygittest> git status
25.On branch master
26.Your branch is up-to-date with 'origin/master'.
27.nothing to commit, working directory clean
28.PS C:\project\mygittest> git stash show
29. dir.txt  | Bin 3010 -> 3010 bytes
30. dir2.txt | Bin 0 -> 3302 bytes
31. dir3.txt | Bin 0 -> 3594 bytes
32. 3 files changed, 0 insertions(+), 0 deletions(-)
33.
34.
35.
36.PS C:\project\mygittest> git stash pop
37.On branch master
38.Your branch is up-to-date with 'origin/master'.
39.Changes to be committed:
40.  (use "git reset HEAD <file>..." to unstage)
41.
42.        new file:   dir2.txt
43.        new file:   dir3.txt
44.
45.Changes not staged for commit:
46.  (use "git add <file>..." to update what will be committed)
47.  (use "git checkout -- <file>..." to discard changes in working directory)
48.
49.        modified:   dir.txt
50.
51.Dropped refs/stash@{0} (98328051468c0254db4cd429e0750e920f1af487)
52.
53.
54.
55.PS C:\project\mygittest> git stash show
56.No stash found.
57.
58.
59.
60.PS C:\project\mygittest> git status
61.On branch master
62.Your branch is up-to-date with 'origin/master'.
63.Changes to be committed:
64.  (use "git reset HEAD <file>..." to unstage)
65.
66.        new file:   dir2.txt
67.        new file:   dir3.txt
68.
69.Changes not staged for commit:
70.  (use "git add <file>..." to update what will be committed)
71.  (use "git checkout -- <file>..." to discard changes in working directory)
72.
73.        modified:   dir.txt

로그 3개만 보기

1.PS C:\project\mygittest> git log -p -3
2.commit 5d4d6d20eb4f661b047ef18e613881c9807899c4
3.Author: Hyundong Hwang <hhd2002@gmail.com>
4.Date:   Wed Jan 27 18:57:12 2016 +0900
5.
6.    test
7.
8.diff --git a/abc.html b/abc.html
9.new file mode 100644

로그 트리로 보기

1.PS C:\project\mygittest> git log --pretty=format:"%h %s - %an %ar" --graph -10
2.* 5d4d6d2 test - Hyundong Hwang 3 hours ago
3.* e0f3057 test - Hyundong Hwang 4 hours ago
4.* 25dfeab 서브모듈 커밋 - hhd2002 9 months ago
5.* aea15df submodulechanged - hhd2002 9 months ago
6.* 899f8cf firstcommit - hhd2002 9 months ago

알리아스 만들기

1.$ git config --global alias.last 'log -1 HEAD'

git 도움말 콘솔에서 보기
꼼수인데… 절대 없을것 같은 sub명령어를 실행해본다.
모르는 sub명령어인데 이거 써보겠냐며 suggestion이 나온다. –;;

1.PS C:\project\mygittest> git commit --abcdefgh
2.error: unknown option `abcdefgh'
3.usage: git commit [<options>] [--] <pathspec>...
4.
5.    -q, --quiet           suppress summary after successful commit
6.    -v, --verbose         show diff in commit message template
7.
8.Commit message options
9.    -F, --file <file>     read message from file
10.    --author <author>     override author for commit
11....

브랜치 실습
브랜치를 만들고 master에 머지하는 실습

1.PS C:\project\mygittest> git branch
2.* master
3.
4.PS C:\project\mygittest> git branch feature/my-cool-func
5.
6.PS C:\project\mygittest> git branch
7.  feature/my-cool-func
8.* master
9.
10.PS C:\project\mygittest> git checkout feature/my-cool-func
11.Switched to branch 'feature/my-cool-func'
12.
13.PS C:\project\mygittest> git branch
14.* feature/my-cool-func
15.  master
16.
17.PS C:\project\mygittest> dir > cool.txt
18.PS C:\project\mygittest> dir > cool2.txt
19.PS C:\project\mygittest> git add *
20.
21.PS C:\project\mygittest> git commit -a -m "cool func"
22.[feature/my-cool-func 983f398] cool func
23. 2 files changed, 0 insertions(+), 0 deletions(-)
24. create mode 100644 cool.txt
25. create mode 100644 cool2.txt
26.PS C:\project\mygittest> git push
27.fatal: The current branch feature/my-cool-func has no upstream branch.
28.To push the current branch and set the remote as upstream, use
29.
30.    git push --set-upstream origin feature/my-cool-func
31.
32.
33.
34.PS C:\project\mygittest> git push -u
35.fatal: The current branch feature/my-cool-func has no upstream branch.
36.To push the current branch and set the remote as upstream, use
37.
38.    git push --set-upstream origin feature/my-cool-func
39.
40.
41.PS C:\project\mygittest> git push -u origin feature/my-cool-func
42.Counting objects: 4, done.
43.Delta compression using up to 4 threads.
44.Compressing objects: 100% (4/4), done.
45.Writing objects: 100% (4/4), 743 bytes | 0 bytes/s, done.
46.Total 4 (delta 2), reused 0 (delta 0)
47.To git@github.com:HyundongHwang/gittest.git
48. * [new branch]      feature/my-cool-func -> feature/my-cool-func
49.Branch feature/my-cool-func set up to track remote branch feature/my-cool-func from origin.
50.
51.PS C:\project\mygittest> git checkout master
52.Switched to branch 'master'
53.Your branch is up-to-date with 'origin/master'.
54.
55.PS C:\project\mygittest> dir > current.txt
56.PS C:\project\mygittest> dir > current2.txt
57.PS C:\project\mygittest> git add *
58.
59.PS C:\project\mygittest> git commit -a -m "current change"
60.[master af8f24d] current change
61. 2 files changed, 0 insertions(+), 0 deletions(-)
62. create mode 100644 current.txt
63. create mode 100644 current2.txt
64.PS C:\project\mygittest> git push
65.Counting objects: 4, done.
66.Delta compression using up to 4 threads.
67.Compressing objects: 100% (4/4), done.
68.Writing objects: 100% (4/4), 765 bytes | 0 bytes/s, done.
69.Total 4 (delta 2), reused 0 (delta 0)
70.To git@github.com:HyundongHwang/gittest.git
71.   035ce62..af8f24d  master -> master
72.
73.
74.
75.PS C:\project\mygittest> git merge feature/my-cool-func
76.Merge made by the 'recursive' strategy.
77. cool.txt  | Bin 0 -> 4470 bytes
78. cool2.txt | Bin 0 -> 4762 bytes
79. 2 files changed, 0 insertions(+), 0 deletions(-)
80. create mode 100644 cool.txt
81. create mode 100644 cool2.txt
82.
83.
84.
85.PS C:\project\mygittest> git log --graph
86.*   commit 92be49b3789a691546180f0b9822951b46084830
87.|\  Merge: af8f24d 983f398
88.| | Author: Hyundong Hwang <hhd2002@gmail.com>
89.| | Date:   Wed Jan 27 23:04:27 2016 +0900
90.| |
91.| |     Merge branch 'feature/my-cool-func'
92.| |
93.| * commit 983f398f54394f750475bd92ed61f36a552175b5
94.| | Author: Hyundong Hwang <hhd2002@gmail.com>
95.| | Date:   Wed Jan 27 23:01:24 2016 +0900
96.| |
97.| |     cool func
98.| |
99.* | commit af8f24dd06cf1582a770fea7254719dc52506e78
100.|/  Author: Hyundong Hwang <hhd2002@gmail.com>
101.|   Date:   Wed Jan 27 23:03:38 2016 +0900
102.|
103.|       current change
104.|
105.*   commit 035ce62b030f87e8ce3360bebe5477048200766c
106.|\  Merge: 159900b 54ace0a
107.| | Author: Hyundong Hwang <hhd2002@gmail.com>
108.| | Date:   Wed Jan 27 22:40:31 2016 +0900
109.| |
110.| |     Merge branch 'feature/abc'
111.| |
112.| * commit 54ace0a7b19f04aebc5726255cdd642b4f970982
113.| | Author: Hyundong Hwang <hhd2002@gmail.com>
114.| | Date:   Wed Jan 27 22:38:37 2016 +0900
115.| |
116.| |     abc *
117.| |
118.* | commit 159900b9d9908b0c5e410a75e67fa574821086ce
119.|/  Author: Hyundong Hwang <hhd2002@gmail.com>
120.|   Date:   Wed Jan 27 22:39:40 2016 +0900
121.|
122.|       master dir
123.|
124.
125.
126.
127.PS C:\project\mygittest> git push
128.Counting objects: 2, done.
129.Delta compression using up to 4 threads.
130.Compressing objects: 100% (2/2), done.
131.Writing objects: 100% (2/2), 345 bytes | 0 bytes/s, done.
132.Total 2 (delta 1), reused 0 (delta 0)
133.To git@github.com:HyundongHwang/gittest.git
134.   af8f24d..92be49b  master -> master
135.
136.
137.

submodule 추가

1.PS C:\project\gittest> git submodule init
2.
3.PS C:\project\gittest> git submodule add --force git@github.com:HyundongHwang/gitsubmodule.git
4.
5.PS C:\project\gittest> cd .\gitsubmodule\
6.
7.PS C:\project\gittest\gitsubmodule> git pull
8.Already up-to-date.
9.
10.PS C:\project\gittest\gitsubmodule> git remote -v
11.origin  https://github.com/HyundongHwang/gitsubmodule (fetch)
12.origin  https://github.com/HyundongHwang/gitsubmodule (push)
13.
14.PS C:\project\gittest\gitsubmodule> git status
15.On branch master
16.Your branch is up-to-date with 'origin/master'.
17.nothing to commit, working directory clean
18.
19.PS C:\project\gittest\gitsubmodule> cd ..
20.
21.PS C:\project\gittest> git status
22.warning: LF will be replaced by CRLF in .gitmodules.
23.The file will have its original line endings in your working directory.
24.On branch master
25.Your branch is up-to-date with 'origin/master'.
26.Changes to be committed:
27.  (use "git reset HEAD <file>..." to unstage)
28.
29.        modified:   .gitmodules
30.        new file:   gitsubmodule
31.
32.PS C:\project\gittest> git commit -a -m "add submodule gitsubmodule"
33.[master warning: LF will be replaced by CRLF in .gitmodules.
34.The file will have its original line endings in your working directory.
35.0f839b0] add submodule gitsubmodule
36.warning: LF will be replaced by CRLF in .gitmodules.
37.The file will have its original line endings in your working directory.
38. 2 files changed, 4 insertions(+)
39. create mode 160000 gitsubmodule
40.
41.PS C:\project\gittest> git push
42.Counting objects: 3, done.
43.Delta compression using up to 4 threads.
44.Compressing objects: 100% (3/3), done.
45.Writing objects: 100% (3/3), 391 bytes | 0 bytes/s, done.
46.Total 3 (delta 1), reused 1 (delta 0)
47.To git@github.com:HyundongHwang/gittest.git
48.   7d08691..0f839b0  master -> master
49.

submodule 내부에서 수정후 업데이트

1.PS C:\project\gittest\gitsubmodule> dir > dir.txt
2.
3.PS C:\project\gittest\gitsubmodule> git status
4.On branch master
5.Your branch is up-to-date with 'origin/master'.
6.Changes not staged for commit:
7.  (use "git add <file>..." to update what will be committed)
8.  (use "git checkout -- <file>..." to discard changes in working directory)
9.
10.        modified:   dir.txt
11.
12.no changes added to commit (use "git add" and/or "git commit -a")
13.
14.PS C:\project\gittest\gitsubmodule> git commit -a -m "modify dir.txt"
15.[master 5e79c29] modify dir.txt
16. 1 file changed, 0 insertions(+), 0 deletions(-)
17.
18.PS C:\project\gittest\gitsubmodule> git push
19.Counting objects: 3, done.
20.Delta compression using up to 4 threads.
21.Compressing objects: 100% (3/3), done.
22.Writing objects: 100% (3/3), 311 bytes | 0 bytes/s, done.
23.Total 3 (delta 2), reused 0 (delta 0)
24.To git@github.com:HyundongHwang/gitsubmodule.git
25.   7be4d74..5e79c29  master -> master
26.
27.PS C:\project\gittest\gitsubmodule> cd ..
28.
29.PS C:\project\gittest> git status
30.On branch master
31.Your branch is up-to-date with 'origin/master'.
32.Changes not staged for commit:
33.  (use "git add <file>..." to update what will be committed)
34.  (use "git checkout -- <file>..." to discard changes in working directory)
35.
36.        modified:   gitsubmodule (new commits)
37.
38.no changes added to commit (use "git add" and/or "git commit -a")
39.
40.PS C:\project\gittest> git submodule update
41.Submodule path 'gitsubmodule': checked out 'f57ae8c95b582dca790ef821e86ebd11e0f1ce51'
42.
43.PS C:\project\gittest> git status
44.On branch master
45.Your branch is up-to-date with 'origin/master'.
46.nothing to commit, working directory clean
47.

submodule 외부에서 수정후 업데이트

1.PS C:\project\gitsubmodule> git diff
2.diff --git a/dir.txt b/dir.txt
3.index 03a80a8..1181f77 100644
4.Binary files a/dir.txt and b/dir.txt differ
5.
6.PS C:\project\gitsubmodule> git commit -a -m "modify dir.txt"
7.[master add3b58] modify dir.txt
8. 1 file changed, 0 insertions(+), 0 deletions(-)
9.PS C:\project\gitsubmodule> git push
10.Counting objects: 3, done.
11.Delta compression using up to 4 threads.
12.Compressing objects: 100% (3/3), done.
13.Writing objects: 100% (3/3), 348 bytes | 0 bytes/s, done.
14.Total 3 (delta 2), reused 0 (delta 0)
15.To git@github.com:HyundongHwang/gitsubmodule.git
16.   5e79c29..add3b58  master -> master
17.
18.PS C:\project\gitsubmodule> cd ..
19.
20.PS C:\project> git .\gittest\
21.git: '.\gittest\' is not a git command. See 'git --help'.
22.
23.PS C:\project\gittest> cd .\gitsubmodule\
24.
25.PS C:\project\gittest\gitsubmodule> git status
26.HEAD detached at f57ae8c
27.nothing to commit, working directory clean
28.
29.PS C:\project\gittest\gitsubmodule> git checkout master
30.Previous HEAD position was f57ae8c... dir2.txt add
31.Switched to branch 'master'
32.Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
33.  (use "git pull" to update your local branch)
34.
35.PS C:\project\gittest\gitsubmodule> git status
36.On branch master
37.Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
38.  (use "git pull" to update your local branch)
39.nothing to commit, working directory clean
40.
41.PS C:\project\gittest\gitsubmodule> git pull
42.Updating 5e79c29..add3b58
43.Fast-forward
44. dir.txt | Bin 2290 -> 2032 bytes
45. 1 file changed, 0 insertions(+), 0 deletions(-)
46.
47.PS C:\project\gittest\gitsubmodule> git status
48.On branch master
49.Your branch is up-to-date with 'origin/master'.
50.nothing to commit, working directory clean
51.
52.PS C:\project\gittest\gitsubmodule> cd ..
53.
54.PS C:\project\gittest> git status
55.On branch master
56.Your branch is up-to-date with 'origin/master'.
57.Changes not staged for commit:
58.  (use "git add <file>..." to update what will be committed)
59.  (use "git checkout -- <file>..." to discard changes in working directory)
60.
61.        modified:   gitsubmodule (new commits)
62.
63.no changes added to commit (use "git add" and/or "git commit -a")
64.
65.PS C:\project\gittest> git submodule update
66.Submodule path 'gitsubmodule': checked out 'f57ae8c95b582dca790ef821e86ebd11e0f1ce51'
67.
68.PS C:\project\gittest> git status
69.On branch master
70.Your branch is up-to-date with 'origin/master'.
71.nothing to commit, working directory clean
72.PS C:\project\gittest>

submodule 제거

1.PS C:\project\gittest> git rm .\gitsubmodule\
2.rm 'gitsubmodule'
3.PS C:\project\gittest> git status
4.On branch master
5.Your branch is up-to-date with 'origin/master'.
6.Changes to be committed:
7.  (use "git reset HEAD <file>..." to unstage)
8.
9.        modified:   .gitmodules
10.        deleted:    gitsubmodule
11.
12.PS C:\project\gittest> git commit -a -m "remove gitsubmodule"
13.[master 0da6537] remove gitsubmodule
14. 2 files changed, 4 deletions(-)
15. delete mode 160000 gitsubmodule
16.
17.PS C:\project\gittest> git push
18.Counting objects: 3, done.
19.Delta compression using up to 4 threads.
20.Compressing objects: 100% (2/2), done.
21.Writing objects: 100% (3/3), 286 bytes | 0 bytes/s, done.
22.Total 3 (delta 1), reused 0 (delta 0)
23.To git@github.com:HyundongHwang/gittest.git
24.   0f839b0..0da6537  master -> master
25.
26.PS C:\project\gittest> git status
27.On branch master
28.Your branch is up-to-date with 'origin/master'.
29.nothing to commit, working directory clean

이 글은 Evernote에서 작성되었습니다. Evernote는 하나의 업무 공간입니다. Evernote를 다운로드하세요.

이 블로그 검색

황현동 블로그

160204 파워쉘을 위한 git 명령어 모음

160204 파워쉘을 위한 git 명령어 모음

댓글

댓글 쓰기