• 기본구조: Local -> staging area -> Remote -> Github

• Commit message

  • General

    • git commit message

  • ethereum github

    format: {directory names}: {contents}

    example: core, eth/protocls/snap: fix cause for snap-sync corruption

• fast-forward 관계: 로컬 저장소에 commit이 있을때만 pull을 허용(즉, 원격저장소에 commit이 존재하는데 pull을 하지 않고 로컬저장소에서 commit을 하면 pull을 허용x)

• fork vs clone

  • fork: not sync with the origin remote. (under my github ID)
  • clone: sync with the origin remote.
  • PR: pull request (for contributing)

• fetch: download contents from a remote repository.

• behind: the number of commits on the base branch that do not exist on this branch.

• ahead: the number of commits on this branch that do not exist on the base branch.

• git commit할때 특정 파일 제외하는 방법: git stash push, pop

• merge

  • before: git pull —rebase origin feature
    • without creating a merge commit.
  • conflict: git rebase —abort
  • If you decide not to resolve the conflict and want to cancel the merge: git merge —abort

• how to delete remote branch: git push origin -d “branch_name”

• Branches

  • git checkout -b server origin/server
  • Update the git remote branch git remote update
  • Fetch the git remote branch. git checkout -t origin/remote
  • Remove the remote branch. git push origin -d branch name
  • git reset --hard "버전 id": 이전 버전으로 돌아가기
  • git fetch --prune: removing deleted branches from local remote-tracking

git remote (원격저장소) git remote: 원격 저장소 이름 목로을 표시 git remote -v: 자세한 목록보기 git remote add [name] [url]: 원격 저장소 추가 git remote rm [name]: 원격 저장소를 제거