git (2) 쉐도우 머지 머지 커밋을 만들지 않고 머지 충돌(conflict) 확인만 할때 사용한다. git merge Join two or more development histories together --log[=], --no-log In addition to branch names, populate the log message with one-line descriptions from at most actual commits that are being merged. See also git-fmt-merge-msg(1). --no-ff Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when me.. 지정된 커밋을 포함하는 브랜치 확인 리모트 브랜치: origin/master 커밋 해쉬: 28b161252be65dedc3fa26e28b633d427beef0a7 git branch List, create, or delete branches -r, --remotes List or delete (if used with -d) the remote-tracking branches. --contains [] Only list branches which contain the specified commit (HEAD if not specified). Implies --list. $ git branch -r --contains 28b161252be65dedc3fa26e28b633d427beef0a7 origin/master 이전 1 다음