Git

Command

Git 팁 모음집 (https://github.com/git-tips/tips 한국어 버전)
add
- Undo 'git add' before commit git reset <files>

amend

Rewriting history git commit --amend git rebase git rebase -i git reflog

$ git commit -m "Some message..."
# Change something
$ git add [file]
$ git commit --amend -m "Some message..." # fix up the most recent commit

bisect
- The git's guide to git: Bisect
branch
- learngitbranching.js.org
- Git 브랜치 배우기
- Git 브랜치 배우기
- Git을 이용한 협업 워크플로우 배우기
- A successful Git branching model
  - git feature branch 모델 프로젝트 적용기
- 효율적인 협업을 위한 Git Branching 전략
- create new branch
```
git branch [new branch]
...
git remote add [new branch] remotes/origin/[new branch]
git push origin [new branch]
```
- git push origin --delete [branch name] Delete Remote Branch
- git branch -d [branch name] How to delete a Git branch both locally and remotely?
- git checkout -b [branch name] remotes/[repository name]/[branch name] How to check out a remote Git branch?
checkout
- git checkout [branch name] -- [file name] checkout specific files from another branch
- git checkout HEAD -- path/to/file.txt Find and restore a deleted file in a Git repository
  - 상황
    - old/path/file.txt를 git mv file.txt new/path를 사용해 new/path/file.txt로 변경
    - 다시 old/path/file.txt로 변경하고 싶어서 git reset new/path/file.txt를 실행했다가 new/path에서는 사라지고 old/path에도 복원되지 않은 경우 사용
clean
- git clean -fd git이 추적하지 않는 untracked files 한꺼번에 삭제하기
clone
- git clone https://[username]:'[password]'@github.com/[username]/[repository] enclose password in quotes if password has special characters

commit

did you know you can appear to commit as anyone?
Blinking Commits

undo a commit and redo

$ git commit -m "Something terribly misguided"              (1)
$ git reset [--soft|--hard] HEAD~                           (2)
<< edit files as necessary >>                               (3)
$ git add ...                                               (4)
$ git commit -c ORIG_HEAD                                   (5)

Git commit 이력 깔끔하게 관리하기
git commit 메시지에 #이슈번호 형태로 쓰기
prepare-commit-msg 깃훅으로 커밋 메시지에 이슈 번호 넣기

config

basics

$ git config --global url."https://github.com/".insteadOf git://github.com/
$ git config --global http.proxy http://...
$ git config --global https.proxy http://...
$ git config -l
... # do some necessary work
$ git config --global --unset url.https://github.com/.insteadof
$ git config --global --unset http.proxy
$ git config --global --unset https.proxy

한 컴퓨터에서 두 개의 서로 다른 github 계정을 사용하고 싶은 경우 Specify private SSH-key to use when executing shell command with or without Ruby?

$ ssh-keygen -t rsa -C "another@email.com"  # create one more ssh key
Generating public/private rsa key pair.
Enter file in which to save the key (/Users/myaccount/.ssh/id_rsa): id_rsa_another
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in id_rsa_another.
...

$ mv id_rsa_another* ~/.ssh/
$ ls ~/.ssh/
id_rsa                  id_rsa.pub              id_rsa_another
id_rsa_another.pub      known_hosts

$ vi ~/.ssh/config
# Default GitHub
Host github.com
    HostName github.com
    PreferredAuthentications publickey
    IdentityFile ~/.ssh/id_rsa

# GitHub
Host another.github.com
    HostName github.com
    PreferredAuthentications publickey
    IdentityFile ~/.ssh/id_rsa_another

$ ssh-add ~/.ssh/id_rsa_another
Identity added: /Users/myaccount/.ssh/id_rsa_another (/Users/myaccount/.ssh/id_rsa_another)

$ ssh-add ~/.ssh/id_rsa
Identity added: /Users/myaccount/.ssh/id_rsa (/Users/myaccount/.ssh/id_rsa)

$ ssh-add -l
2048 SHA256:... /Users/myaccount/.ssh/id_rsa_another (RSA)
4096 SHA256:... /Users/myaccount/.ssh/id_rsa (RSA)

$ ssh -T git@github.com
Hi User! You've successfully authenticated, but GitHub does not provide shell access.
$ ssh -T git@another.github.com
Hi User! You've successfully authenticated, but GitHub does not provide shell access.

$ git clone git@another.github.com:<github_another_id>/<repository>.git

git config credential.helper store How to save username and password in git
깃의 config
깃헙 서로 다른 저장소를 같은 서버에 배포시 배포 키 중복 오류

diff
- git --no-pager diff for long line over 80 columns
  - git diff handling long lines
- git diff ... --name-only
- git diff <commit1> <commit2> <filename> How to diff the same file between two different commits on the same branch?
hook
- husky prevents bad commit or push using Git hooks
- 훅으로 Git에 훅 들어가기
inject amend commits other than HEAD
log
- git log --all -- [deleted path/to/file] How to locate a deleted file in the commit history?
- git log --oneline --graph --all --branches --decorate
  - How to Write a Git Commit Message
  - Git log in JSON format
- git log -g --grep=STRING
  - How to search for a commit message in github?
- How to Write a Git Commit Message
  - Git 커밋 메시지 작성법
- A useful template for commit messages
merge
- How to "Merge" Specific Files from Another Branch
- git merge --no-commit --no-ff <name> Is there a git-merge --dry-run option?
- git merge <name> -X theirs Force Git to always choose the newer version during a merge?
  - e.g. branch merge할 때 의 내용으로 덮어쓰고 싶은 경우
- practice --ours / --theirs
- practice - merge conflict 해결 변경 내역 유실 및 삭제 복구
show
undo
- How to undo (almost) anything with Git
pandoc; git으로 word file을 diff할 때 그냥 비교하면 안 되는데 이걸 markdown으로 바꿔 비교할 수 있도록 하는 명령어
pull request
- GitHub로 남의 프로젝트에 감놓고 배놓기
- example
- Checking Out GitHub Pull Requests Locally
- Bitbucket Pull Requests
- Pull Request를 이용한 개발 흐름을 적용해 보고 나서...
- GitHub의 Pull Request를 로컬로 가져오기
- 오픈소스 git 프로젝트에 Pull Request 보내기
rebase
- 'rebaser' improves on 'git rebase -i' by adding information per commit regarding which files it touched
- practice --ours / --theirs
- Rewriting history git commit --amend git rebase git rebase -i git reflog
- [뭘, 이런걸 다?] git에서 특정 commit에 들어간 수정 파일을 다른 commit으로 옮기는 방법
reflog
- Rewriting history git commit --amend git rebase git rebase -i git reflog

remote

이미 존재하는 project를 fork한 후 pull request를 위해 원래 repository와 연결

$ git remote add [name] git@github.com:[id]/[project].git
$ git fetch [name]
$ git branch -a
  * master
    remotes/[name]/[branch name]
    remotes/origin/HEAD -> origin/master
$ git merge [name]/[branch name]
...

reset
- Unstage a deleted file in git
- git reset --hard ORIG_HEAD
revert
- git revert로 커밋 되돌리기
- revert-a-faulty-merge
submodule
- Mastering Git submodules
- Git: 서브모듈 이해하기 (git submodule)
  - practice
    - github.com/hyunjun/test_parent
    - github.com/hyunjun/test_child
- Git submodule add: “a git directory is found locally” issue rm -rf .git/modules/[submodule name]
- Easy way pull latest of all submodules
- 여러개의 Git 저장소 (repository)로 이루어진 프로젝트 관리하기
subtree
- git subtree를 사용하여 재사용할 코드 독립 시키기

tag

$ git tag -a [tagname] -m "[annotation]"
$ git show [tagname]
$ git push origin --tags

How to: Delete a remote Git tag

git tag -d 12345
git push origin :refs/tags/12345

GitHub Flow explain
GitHub Flow - demo

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Git

Command

Library

FilesExpand file tree

git.md

Latest commit

History

git.md

File metadata and controls

Git

Command

Library