forked from rogerdudler/git-guide
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
229 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,229 @@ | ||
<!DOCTYPE html> | ||
<html lang="ko"> | ||
<head> | ||
<meta charset="utf-8"> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | ||
<title>git - 간편가이드 - 어렵지 않아요!</title> | ||
<link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'> | ||
<link rel="stylesheet" href="css/normalize.css" type="text/css"> | ||
<link rel="stylesheet" href="css/style.css" type="text/css"> | ||
<script type="text/javascript"> | ||
var _gaq = _gaq || []; | ||
_gaq.push(['_setAccount', 'UA-652147-13']); | ||
_gaq.push(['_trackPageview']); | ||
|
||
(function() { | ||
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; | ||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; | ||
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); | ||
})(); | ||
|
||
function recordOutboundLink(link, category, action) { | ||
_gat._getTrackerByName()._trackEvent(category, action); | ||
setTimeout('document.location = "' + link.href + '"', 100); | ||
} | ||
</script> | ||
</head> | ||
<body> | ||
<div class="scrollblock block-title"> | ||
<h1>git - 간편가이드</h1> | ||
<p>git 을 시작하기 위한 간편 가이드. 어렵지 않아요 ;)</p> | ||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="rogerdudler" data-size="large" data-url="http://rogerdudler.github.com/git-guide" data-related="rogerdudler" data-hashtags="git">Tweet</a> | ||
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> | ||
<p class="meta"> | ||
만든이 <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> | ||
<br />도와준 이들<a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a> 와 <a href="http://www.namics.com">Namics</a><br /> | ||
다른 언어로 보기 <a href="index.de.html">deutsch</a>, <a href="index.es.html">español</a>, <a href="index.fr.html">français</a>, <a href="index.it.html">italiano</a>, <a href="index.nl.html">nederlands</a>, <a href="index.pt_BR.html">português</a>, <a href="index.ru.html">русский</a>, <br/> | ||
<a href="index.ja.html">日本語</a>, <a href="index.zh.html">中文</a>, <a href="index.ko.html">한국어</a> <br/> | ||
이슈 리포트는 이쪽으로 <a href="https://github.com/rogerdudler/git-guide/issues">github</a> | ||
</p> | ||
<img src="img/arrow.png" alt="" /> | ||
</div> | ||
<!-- setup --> | ||
<a name="setup"></a> | ||
<div class="scrollblock block-setup"> | ||
<h2>설치</h2> | ||
<p> | ||
<a href="http://code.google.com/p/git-osx-installer/downloads/list?can=3">OSX용 git 다운로드</a> | ||
</p> | ||
<p> | ||
<a href="http://code.google.com/p/msysgit/downloads/list?can=3">Windows용 git 다운로드</a> | ||
</p> | ||
<p> | ||
<a href="http://book.git-scm.com/2_installing_git.html">Linux용 git 다운로드</a> | ||
</p> | ||
</div> | ||
<a name="create"></a> | ||
<div class="scrollblock block-create"> | ||
<h2>새로운 저장소 만들기</h2> | ||
<p> | ||
새로운 저장소를 만들기 위해, 다음 명령을 실행합니다.<br /> | ||
<code>git init</code><br /> | ||
새로운 git 저장소가 만들어 집니다. | ||
</p> | ||
</div> | ||
<a name="checkout"></a> | ||
<div class="scrollblock block-checkout"> | ||
<h2>저장소 체크아웃하기</h2> | ||
<p> | ||
로컬 저장소를 복사(클론)하기 위해, 다음 명령을 실행합니다.<br /> | ||
<code>git clone /path/to/repository</code><br /> | ||
원격 서버의 저장소를 복사(클론)하기 위해서는, 다음 명령을 실행합니다.<br /> | ||
<code>git clone username@host:/path/to/repository</code> | ||
</p> | ||
</div> | ||
<a name="trees"></a> | ||
<div class="scrollblock block-trees"> | ||
<h2>작업 흐름</h2> | ||
<p> | ||
로컬 저장소는 git 에서 관리하는 세그루의 나무로 구성됩니다. | ||
첫번째 나무인 <code>Working Directory</code> 는 실제 파일들로 이루어집니다. | ||
두번째 나무인 <code>Index</code> 는 준비단계의 역할을 하고, | ||
마지막 나무인 <code>HEAD</code> 는 최종 커밋을 나타냅니다. | ||
</p> | ||
<img src="img/trees.png" alt="" /> | ||
</div> | ||
<a name="add"></a> | ||
<div class="scrollblock block-add"> | ||
<h2>추가 & 커밋</h2> | ||
<p> | ||
You can propose changes (add it to the <b>Index</b>) using<br /> | ||
<code>git add <filename></code><br /> | ||
<code>git add *</code><br /> | ||
This is the first step in the basic git workflow. To actually commit these changes use<br /> | ||
<code>git commit -m "Commit message"</code><br /> | ||
Now the file is committed to the <b>HEAD</b>, but not in your remote repository yet. | ||
</p> | ||
</div> | ||
<a name="push"></a> | ||
<div class="scrollblock block-remote"> | ||
<h2>pushing changes</h2> | ||
<p> | ||
Your changes are now in the <b>HEAD</b> of your local working copy. To send those changes to your remote repository, execute <br /> | ||
<code>git push origin master</code><br /> | ||
Change <i>master</i> to whatever branch you want to push your changes to. | ||
<br /><br /> | ||
If you have not cloned an existing repository and want to connect your repository to a remote server, you need to add it with<br /> | ||
<code>git remote add origin <server></code><br /> | ||
Now you are able to push your changes to the selected remote server<br /> | ||
|
||
</p> | ||
</div> | ||
<a name="branching"></a> | ||
<div class="scrollblock block-branching"> | ||
<h2>branching</h2> | ||
<p> | ||
Branches are used to develop features isolated from each other. The <i>master</i> branch is the "default" branch when you create a repository. Use other branches for development and merge them back to the master branch upon completion. | ||
</p> | ||
<img src="img/branches.png" alt="" /> | ||
<p> | ||
create a new branch named "feature_x" and switch to it using<br /> | ||
<code>git checkout -b feature_x</code><br /> | ||
switch back to master<br /> | ||
<code>git checkout master</code><br /> | ||
and delete the branch again<br /> | ||
<code>git branch -d feature_x</code><br /> | ||
a branch is <i>not available to others</i> unless you push the branch to your remote repository<br /> | ||
<code>git push origin <branch></code> | ||
</p> | ||
</div> | ||
<a name="update"></a> | ||
<div class="scrollblock block-merging"> | ||
<h2>update & merge</h2> | ||
<p> | ||
to update your local repository to the newest commit, execute <br /> | ||
<code>git pull</code><br /> | ||
in your working directory to <i>fetch</i> and <i>merge</i> remote changes.<br /> | ||
to merge another branch into your active branch (e.g. master), use<br /> | ||
<code>git merge <branch></code><br /> | ||
in both cases git tries to auto-merge changes. Unfortunately, this is not always possible and results in <i>conflicts</i>. | ||
You are responsible to merge those <i>conflicts</i> | ||
manually by editing the files shown by git. After changing, you need to mark them as merged with<br /> | ||
<code>git add <filename></code><br /> | ||
before merging changes, you can also preview them by using<br /> | ||
<code>git diff <source_branch> <target_branch></code> | ||
</p> | ||
</div> | ||
<a name="tagging"></a> | ||
<div class="scrollblock block-tagging"> | ||
<h2>tagging</h2> | ||
<p> | ||
it's recommended to create tags for software releases. this is a known concept, which also exists in SVN. You can create a new tag named <i>1.0.0</i> by executing<br /> | ||
<code>git tag 1.0.0 1b2e1d63ff</code><br /> | ||
the <i>1b2e1d63ff</i> stands for the first 10 characters of the commit id you want to reference with your tag. You can get the commit id with <br /> | ||
<code>git log</code><br /> | ||
you can also use fewer characters of the commit id, it just has to be unique. | ||
</p> | ||
</div> | ||
<a name="checkout-replace"></a> | ||
<div class="scrollblock block-checkout-replace"> | ||
<h2>replace local changes</h2> | ||
<p> | ||
In case you did something wrong (which for sure never happens ;) you can replace local changes using the command<br /> | ||
<code>git checkout -- <filename></code><br /> | ||
this replaces the changes in your working tree with the last content in HEAD. Changes already added to the index, as well as new files, will be kept. | ||
</p> | ||
<p> | ||
If you instead want to drop all your local changes and commits, fetch the latest history from the server and point your local master branch at it like this<br /> | ||
<code>git fetch origin</code><br /> | ||
<code>git reset --hard origin/master</code> | ||
</p> | ||
</div> | ||
<a name="hints"></a> | ||
<div class="scrollblock block-hints"> | ||
<h2>useful hints</h2> | ||
<p> | ||
built-in git GUI<br /> | ||
<code>gitk</code><br /> | ||
use colorful git output<br /> | ||
<code>git config color.ui true</code><br /> | ||
show log on just one line per commit<br /> | ||
<code>git config format.pretty oneline</code><br /> | ||
use interactive adding<br /> | ||
<code>git add -i</code> | ||
</p> | ||
</div> | ||
<a name="resources"></a> | ||
<div class="scrollblock block-resources"> | ||
<h2>links & resources</h2> | ||
<h3>graphical clients</h3> | ||
<p> | ||
<ul> | ||
<li><a href="http://gitx.laullon.com/">GitX (L) (OSX, open source)</a></li> | ||
<li><a href="http://www.git-tower.com/">Tower (OSX)</a></li> | ||
<li><a href="http://www.sourcetreeapp.com/">Source Tree (OSX, free)</a></li> | ||
<li><a href="http://mac.github.com/">GitHub for Mac (OSX, free)</a></li> | ||
</ul> | ||
</p> | ||
<h3>guides</h3> | ||
<p> | ||
<ul> | ||
<li><a href="http://book.git-scm.com/">Git Community Book</a></li> | ||
<li><a href="http://progit.org/book/">Pro Git</a></li> | ||
<li><a href="http://think-like-a-git.net/">Think like a git</a></li> | ||
<li><a href="http://help.github.com/">GitHub Help</a></li> | ||
<li><a href="http://marklodato.github.com/visual-git-guide/index-en.html">A Visual Git Guide</a></li> | ||
</ul> | ||
</p> | ||
</div> | ||
<a name="comments"></a> | ||
<div class="scrollblock block-comments"> | ||
<h2>comments</h2> | ||
<div id="disqus_thread"></div> | ||
<script type="text/javascript"> | ||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ | ||
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname | ||
|
||
/* * * DON'T EDIT BELOW THIS LINE * * */ | ||
(function() { | ||
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; | ||
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; | ||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); | ||
})(); | ||
</script> | ||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> | ||
</div> | ||
<a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a> | ||
<a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a> | ||
</body> | ||
</html> |