Skip to content

Instantly share code, notes, and snippets.

@jangjunha
Created March 23, 2018 07:03
Show Gist options
  • Save jangjunha/2a557f25cf76b7d2dae77249f3a26b9d to your computer and use it in GitHub Desktop.
Save jangjunha/2a557f25cf76b7d2dae77249f3a26b9d to your computer and use it in GitHub Desktop.
TIL 2018. 3. 23

TIL 2018. 3. 23

Git

Merge 할 때 항상 Merge Commit을 만들기 (Fast-forward 하지 않기)

--no-ff 옵션을 붙인다.

Example
$ git merge --no-ff feature/til

Rebase 할 때 Merge Commit도 보이기

-p 옵션을 붙인다.

Example
$ git rebase -i -p HEAD~2

특정 Commit을 push하기

Example
$ git push origin 1a2b3c4:develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment