Skip to content

Commit 91c0c83

Browse files
code1009code1009
committed
1
1 parent ba7f27d commit 91c0c83

File tree

1 file changed

+50
-20
lines changed

1 file changed

+50
-20
lines changed

‎web/git/page.html‎

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,61 @@
1414

1515
</head>
1616
<body>
17-
<div id="contents">
17+
<div id="contents">
1818

1919

20-
<!-- ******************************************************************** -->
21-
<h1>자주사용하는 git 명령</h1>
22-
23-
<p>덮어쓰기</p>
24-
<ul>
25-
<li>git reset --hard origin</li>
26-
<li>git reset --soft origin</li>
27-
<li>git reset --soft HEAD~{커밋갯수숫자}</li>
28-
<li>git reset --hard origin/{브렌치이름}</li>
29-
</ul>
20+
<!-- ******************************************************************** -->
21+
<h1>자주사용하는 git 명령</h1>
3022

31-
<p>커밋합치기</p>
32-
<ul>
33-
<li>git rebase -i HEAD~{커밋갯수숫자}</li>
34-
</ul>
23+
<p>
24+
덮어쓰기
25+
</p>
26+
<ul>
27+
<li>
28+
git reset --hard origin
29+
</li>
30+
<li>
31+
git reset --soft origin
32+
</li>
33+
<li>
34+
git reset --soft HEAD~{커밋수}
35+
</li>
36+
<li>
37+
git reset --hard origin/{브렌치-이름}
38+
</li>
39+
</ul>
3540

36-
<p>로컬에서 브렌치전환</p>
37-
<ul>
38-
<li>git checkout {브렌치이름}</li>
39-
</ul>
4041

42+
<p>
43+
커밋합치기
44+
</p>
45+
<ul>
46+
<li>
47+
git rebase -i HEAD~{커밋수}
48+
</li>
49+
</ul>
4150

42-
</div>
51+
52+
<p>
53+
로컬에서 브렌치전환
54+
</p>
55+
<ul>
56+
<li>
57+
git checkout {브렌치-이름}
58+
</li>
59+
</ul>
60+
61+
62+
<p>
63+
새 저장소의 초기 커밋을 기존 저장소와 병합
64+
</p>
65+
<ul>
66+
<li>
67+
git pull origin {브렌치-이름} --allow-unrelated-histories
68+
</li>
69+
</ul>
70+
71+
72+
</div>
4373
</body>
4474
</html>

0 commit comments

Comments
 (0)