git-cheat-sheet-ko.md

Git and Git Flow Cheat Sheet

---

---

Other Available Languages:

1. Arabic Git Cheat Sheet
2. Chinese Git Cheat Sheet
3. Hindi Git Cheat Sheet
4. Turkish Git Cheat Sheet
5. Spanish Git Cheat Sheet
6. Greek Git Cheat Sheet
7. Korean Git Cheat Sheet

깃 치트시트는 당신이 모든 명령어를 외우는 일로부터 벗어나게 해드립니다.

언제든지 기여하고 문법 실수들을 업데이트하세요. 또한 언어 파일을 자유롭게 추가할 수 있습니다.

---

깃 치트시트 한국어

Index

• 설정
• 설정 파일들
• 생성
• 로컬 수정사항
• 검색
• 커밋 히스토리
• 브랜치 & 태그
• 업데이트 & 배포
• 머지 & 리베이스
• 되돌리기
• 깃 플로우

---

설정

현재 설정 구성 보기:

$ git config --list

현재 리포지토리 설정 구성 보기:

$ git config --local --list

글로벌 설정 구성 보기:

$ git config --global --list

시스템 설정 구성 보기:

$ git config --system --list

버전 히스토리 검토할 때 크레딧에 식별 가능한 이름을 설정:

$ git config --global user.name “[firstname lastname]”

각 히스토리 마커와 연결할 이메일 주소 설정:

$ git config --global user.email “[valid-email]”

쉬운 리뷰를 위해서 깃의 자동 명령줄 색 설정:

$ git config --global color.ui auto

커밋에 대한 글로벌 에디터 설정:

$ git config --global core.editor vi

---

설정 파일

특정 리포지토리 설정 파일 [--local]:

<repo>/.git/config

특정 유저 설정 파일 [--global]:

~/.gitconfig

시스템 전체 설정 파일 [--system]:

/etc/gitconfig

---

생성

기존 리포지토리 복제:

2가지 방법이 있습니다:

SSH를 통해

$ git clone ssh://[email protected]/repo.git

HTTP를 통해

$ git clone http://domain.com/user/repo.git

현재 디렉터리에 새로운 로컬 리포지토리 생성:

$ git init

특정 디렉터리에 새로운 로컬 리포지토리 생성:

$ git init <directory>

---

로컬 수정

작업 디렉터리 변경사항:

$ git status

추적된 파일들의 변경사항:

$ git diff

특정 파일의 변경사항/차이 확인:

$ git diff <file>

모든 현재 변경사항을 다음 커밋에 추가:

$ git add .

<file>의 일부 변경사항을 다음 커밋에 추가:

$ git add -p <file>

추적되는 파일들의 모든 로컬 변경사항을 커밋:

$ git commit -a

이전에 stage된 변경사항을 커밋:

$ git commit

메시지와 함께 커밋:

$ git commit -m 'message here'

Staging 영역 건너뛰기 및 메시지 추가하여 커밋:

$ git commit -am 'message here'

과거 날짜에 커밋:

$ git commit --date="`date --date='n day ago'`" -am "<Commit Message Here>"

마지막 커밋 수정:

_{이미 배포된 커밋을 수정하지 마세요!}

$ git commit -a --amend

이전 로그 메시지를 사용하여 마지막 커밋 수정:

_{이미 배포된 커밋을 수정하지 마세요!}

$ git commit --amend --no-edit

마지막 커밋의 커밋 작성자 날짜 수정:

GIT_COMMITTER_DATE="date" git commit --amend

마지막 커밋의 작성자 날짜 수정:

$ git commit --amend --date="date"

현재 브랜치의 커밋되지 않은 변경사항을 다른 브랜치로 이동:

$ git stash
$ git checkout branch2
$ git stash pop

보관된 변경사항을 현재 브랜치로 복원:

$ git stash apply

보관된 특정 변경사항을 현재 브랜치로 복원:

• git stash list를 통해 {stash_number} 를 얻을 수 있습니다.

$ git stash apply stash@{stash_number}

마지막으로 보관된 변경사항을 제거:

$ git stash drop

---

검색

디렉터리에 있는 모든 파일에서 텍스트 검색:

$ git grep "Hello"

버전에서 텍스트 검색:

$ git grep "Hello" v2.5

---

커밋 히스토리

모든 커밋 표시, 가장 최신 커밋부터(커밋 해시, 작성자 정보, 커밋 날짜, 커밋 제목 포함):

$ git log

모든 커밋 표시 (커밋 해시와 커밋 메시지 포함):

$ git log --oneline

특정 유저의 모든 커밋 표시:

$ git log --author="username"

특정 파일에 대한 시간 경과에 따른 변경사항 표시:

$ git log -p <file>

현재 오른쪽 remote 브랜치에만 있는 커밋 표시:

$ git log --oneline <origin/master>..<remote/master> --left-right

<file>에 대한 변경자, 변경사항 그리고 변경일자 표시:

$ git blame <file>

참조 로그 표시:

$ git reflog show

참조 로그 삭제:

$ git reflog delete

---

Move / Rename

Rename a file:

Rename Index.txt to Index.html

$ git mv Index.txt Index.html

---

Branches & Tags

List all local branches:

$ git branch

List local/remote branches

$ git branch -a

List all remote branches:

$ git branch -r

Switch HEAD branch:

$ git checkout <branch>

Checkout single file from different branch

$ git checkout <branch> -- <filename>

Create and switch new branch:

$ git checkout -b <branch>

Create a new branch from an exiting branch and switch to new branch:

$ git checkout -b <new_branch> <existing_branch>

Checkout and create a new branch from existing commit

$ git checkout <commit-hash> -b <new_branch_name>

Create a new branch based on your current HEAD:

$ git branch <new-branch>

Create a new tracking branch based on a remote branch:

$ git branch --track <new-branch> <remote-branch>

Delete a local branch:

$ git branch -d <branch>

Rename current branch to new branch name

$ git branch -m <new_branch_name>

Force delete a local branch:

_{You will lose unmerged changes!}

$ git branch -D <branch>

Mark HEAD with a tag:

$ git tag <tag-name>

Mark HEAD with a tag and open the editor to include a message:

$ git tag -a <tag-name>

Mark HEAD with a tag that includes a message:

$ git tag <tag-name> -am 'message here'

List all tags:

$ git tag

List all tags with their messages (tag message or commit message if tag has no message):

$ git tag -n

---

Update & Publish

List all current configured remotes:

$ git remote -v

Show information about a remote:

$ git remote show <remote>

Add new remote repository, named <remote>:

$ git remote add <remote> <url>

Rename a remote repository, from <remote> to <new_remote>:

$ git remote rename <remote> <new_remote>

Remove a remote:

$ git remote rm <remote>

_{Note: git remote rm does not delete the remote repository from the server. It simply removes the remote and its references from your local repository.}

Download all changes from <remote>, but don't integrate into HEAD:

$ git fetch <remote>

Download changes and directly merge/integrate into HEAD:

$ git remote pull <remote> <url>

Get all changes from HEAD to local repository:

$ git pull origin master

Get all changes from HEAD to local repository without a merge:

$ git pull --rebase <remote> <branch>

Publish local changes on a remote:

$ git push remote <remote> <branch>

Delete a branch on the remote:

$ git push <remote> :<branch> (since Git v1.5.0)

OR

$ git push <remote> --delete <branch> (since Git v1.7.0)

Publish your tags:

$ git push --tags

---

Configure the merge tool globally to meld (editor)

$ git config --global merge.tool meld

Use your configured merge tool to solve conflicts:

$ git mergetool

Merge & Rebase

Merge branch into your current HEAD:

$ git merge <branch>

Rebase your current HEAD onto <branch>:

_{Don't rebase published commit!}

$ git rebase <branch>

Abort a rebase:

$ git rebase --abort

Continue a rebase after resolving conflicts:

$ git rebase --continue

Use your editor to manually solve conflicts and (after resolving) mark file as resolved:

$ git add <resolved-file>

$ git rm <resolved-file>

Squashing commits:

$ git rebase -i <commit-just-before-first>

Now replace this,

pick <commit_id>
pick <commit_id2>
pick <commit_id3>

to this,

pick <commit_id>
squash <commit_id2>
squash <commit_id3>

---

Undo

Discard all local changes in your working directory:

$ git reset --hard HEAD

Get all the files out of the staging area(i.e. undo the last git add):

$ git reset HEAD

Discard local changes in a specific file:

$ git checkout HEAD <file>

Revert a commit (by producing a new commit with contrary changes):

$ git revert <commit>

Reset your HEAD pointer to a previous commit and discard all changes since then:

$ git reset --hard <commit>

Reset your HEAD pointer to a remote branch current state.

$ git reset --hard <remote/branch> e.g., upstream/master, origin/my-feature

Reset your HEAD pointer to a previous commit and preserve all changes as unstaged changes:

$ git reset <commit>

Reset your HEAD pointer to a previous commit and preserve uncommitted local changes:

$ git reset --keep <commit>

Remove files that were accidentally committed before they were added to .gitignore

$ git rm -r --cached .
$ git add .
$ git commit -m "remove xyz file"

---

Git-Flow

Improved Git-flow

Index

• Setup
• Getting Started
• Features
• Make a Release
• Hotfixes
• Commands

---

Setup

You need a working git installation as prerequisite. Git flow works on OSX, Linux and Windows.

OSX Homebrew:

$ brew install git-flow-avh

OSX Macports:

$ port install git-flow

Linux (Debian-based):

$ sudo apt-get install git-flow

Windows (Cygwin):

You need wget and util-linux to install git-flow.

$ wget -q -O - --no-check-certificate https://raw.githubusercontent.com/petervanderdoes/gitflow/develop/contrib/gitflow-installer.sh install <state> | bash

---

Getting Started

Git flow needs to be initialized in order to customize your project setup. Start using git-flow by initializing it inside an existing git repository:

Initialize:

You'll have to answer a few questions regarding the naming conventions for your branches. It's recommended to use the default values.

git flow init

OR

To use default

git flow init -d

---

Features

Develop new features for upcoming releases. Typically exist in developers repos only.

Start a new feature:

This action creates a new feature branch based on 'develop' and switches to it.

git flow feature start MYFEATURE

Finish up a feature:

Finish the development of a feature. This action performs the following:

1) Merged MYFEATURE into 'develop'.

2) Removes the feature branch.

3) Switches back to 'develop' branch

git flow feature finish MYFEATURE

Publish a feature:

Are you developing a feature in collaboration? Publish a feature to the remote server so it can be used by other users.

git flow feature publish MYFEATURE

Getting a published feature:

Get a feature published by another user.

git flow feature pull origin MYFEATURE

Tracking a origin feature:

You can track a feature on origin by using

git flow feature track MYFEATURE

---

Make a Release

Support preparation of a new production release. Allow for minor bug fixes and preparing meta-data for a release

Start a release:

To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch. You can optionally supply a [BASE] commit sha-1 hash to start the release from. The commit must be on the 'develop' branch.

git flow release start RELEASE [BASE]

It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:

git flow release publish RELEASE

(You can track a remote release with the: git flow release track RELEASE command)

Finish up a release:

Finishing a release is one of the big steps in git branching. It performs several actions:

1) Merges the release branch back into 'master'

2) Tags the release with its name

3) Back-merges the release into 'develop'

4) Removes the release branch

git flow release finish RELEASE

Don't forget to push your tags with git push --tags

---

Hotfixes

Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version. May be branched off from the corresponding tag on the master branch that marks the production version.

Git flow hotfix start:

Like the other git flow commands, a hotfix is started with

$ git flow hotfix start VERSION [BASENAME]

The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.

Finish a hotfix:

By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version

git flow hotfix finish VERSION

---

Commands

---

Git flow schema

---