Skip to content

Commit 3bb0c19

Browse files
code1009code1009
committed
1
1 parent 0299168 commit 3bb0c19

File tree

6 files changed

+110
-0
lines changed

6 files changed

+110
-0
lines changed

‎web/git/page.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@charset "utf-8";
2+
3+

‎web/git/page.html‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
5+
<meta charset="utf-8" />
6+
<title>자주사용하는 git 명령</title>
7+
<link rel="stylesheet" type="text/css" href="../core.css" />
8+
<link rel="stylesheet" type="text/css" href="../menu.css" />
9+
<link rel="stylesheet" type="text/css" href="./page.css" />
10+
<script type="text/javascript" src="../core.js"></script>
11+
<script type="text/javascript" src="../menu.js"></script>
12+
<script type="text/javascript" src="../mainmenu.js"></script>
13+
<script type="text/javascript" src="./page.js"></script>
14+
15+
</head>
16+
<body>
17+
<div id="contents">
18+
19+
20+
<!-- ******************************************************************** -->
21+
<h1>자주사용하는 git 명령</h1>
22+
23+
덮어쓰기
24+
git reset --hard origin
25+
git reset --soft origin
26+
git reset --soft HEAD~{커밋갯수숫자}
27+
28+
브렌치덮어쓰기
29+
git reset --hard origin/{브렌치이름}
30+
31+
커밋합치기
32+
git rebase -i HEAD~{커밋갯수숫자}
33+
34+
로컬에서 브렌치전환
35+
git checkout {브렌치이름}
36+
<!-- ____________________________________________________________________ -->
37+
38+
39+
</div>
40+
</body>
41+
</html>

‎web/git/page.js‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
//===========================================================================
3+
"use strict";
4+
5+
6+
7+
8+
9+
/////////////////////////////////////////////////////////////////////////////
10+
//===========================================================================
11+
class Page {
12+
13+
#Context = null;
14+
15+
constructor() {
16+
this.#Context = null;
17+
}
18+
}
19+
20+
21+
22+
23+
24+
/////////////////////////////////////////////////////////////////////////////
25+
//===========================================================================
26+
var _Page = null;
27+
28+
29+
30+
31+
32+
/////////////////////////////////////////////////////////////////////////////
33+
//===========================================================================
34+
function pageInitialize() {
35+
_Page = new Page();
36+
}
37+
38+
39+
40+
41+
42+
/////////////////////////////////////////////////////////////////////////////
43+
//===========================================================================
44+
window.onload = function () {
45+
coreInitialize();
46+
mainMenuInitialize();
47+
pageInitialize();
48+
}
49+
50+

‎web/mainmenu.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class MainMenu {
2929
this._Menu.addDataItem("/윈도우개발/Visual Studio Plugin" , "../Visual Studio Plugin/page.html");
3030
this._Menu.addDataItem("/윈도우개발/Visual Studio C++ 빌드설정" , "../Visual Studio C++ 빌드설정/page.html");
3131
this._Menu.addDataItem("/윈도우개발/Visual Studio 기본설정" , "../Visual Studio 기본설정/page.html");
32+
this._Menu.addDataItem("/개발/자주사용하는 git 명령" , "../git/page.html");
3233
}
3334

3435
initializeMenu() {

‎web/web.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<None Include="0000.template\page.js" />
3030
<None Include="core.css" />
3131
<None Include="core.js" />
32+
<None Include="git\page.css" />
33+
<None Include="git\page.html" />
34+
<None Include="git\page.js" />
3235
<None Include="index.html" />
3336
<None Include="mainmenu.js" />
3437
<None Include="menu.css" />

‎web/web.vcxproj.filters‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<Filter Include="web\윈도우 API utf8 설정">
4141
<UniqueIdentifier>{ffe11a05-991d-49ca-8085-56d3c13cdbb2}</UniqueIdentifier>
4242
</Filter>
43+
<Filter Include="web\git">
44+
<UniqueIdentifier>{24ac4ee1-e795-46fe-b8fd-6b7fcbd56599}</UniqueIdentifier>
45+
</Filter>
4346
</ItemGroup>
4447
<ItemGroup>
4548
<None Include="index.html">
@@ -168,6 +171,15 @@
168171
<None Include="윈도우 API utf8 설정\page.js">
169172
<Filter>web\윈도우 API utf8 설정</Filter>
170173
</None>
174+
<None Include="git\page.css">
175+
<Filter>web\git</Filter>
176+
</None>
177+
<None Include="git\page.html">
178+
<Filter>web\git</Filter>
179+
</None>
180+
<None Include="git\page.js">
181+
<Filter>web\git</Filter>
182+
</None>
171183
</ItemGroup>
172184
<ItemGroup>
173185
<Image Include="logo.png">

0 commit comments

Comments
 (0)