git - pinedance/codenote GitHub Wiki

GIT

remote repo branch name ํ™•์ธ : git branch -r

remote, local branc name ๋ชจ๋‘ ํ™•์ธ : git branch -a

git checkout -b localevent origin/eventsource

remote์™€ local์˜ branch name์ด ๊ฐ™์€ ๊ฒฝ์šฐ๋Š” git checkout -t origin/eventsource ์ด๋ ‡๊ฒŒ

# Switched to branch 'master'
git checkout master
# do it!
git merge --squash issue1
git reset --hard ORIG_HEAD

If you wanna keep your changes git reset --merge ORIG_HEAD

Issues

Git์€ ์ปค๋ฐ‹ํ•  ๋•Œ ์ž๋™์œผ๋กœ CRLF๋ฅผ LF๋กœ ๋ณ€ํ™˜ํ•ด์ฃผ๊ณ  ๋ฐ˜๋Œ€๋กœ Checkoutํ•  ๋•Œ LF๋ฅผ CRLF๋กœ ๋ณ€ํ™˜ํ•ด ์ฃผ๋Š” ๊ธฐ๋Šฅ์ด ์žˆ๋‹ค. core.autocrlf ์„ค์ •์œผ๋กœ ์ด ๊ธฐ๋Šฅ์„ ์ผค ์ˆ˜ ์žˆ๋‹ค. ์œˆ๋„์—์„œ ์ด ๊ฐ’์„ true๋กœ ์„ค์ •ํ•˜๋ฉด Checkoutํ•  ๋•Œ LF ๋ฌธ์ž๊ฐ€ CRLR ๋ฌธ์ž๋กœ ๋ณ€ํ™˜๋œ๋‹ค

ํ™•์ธ๋ฐฉ๋ฒ•์€ .gitconfig ํŒŒ์ผ์„ ์—ด์–ด๋ณด๋ฉด ๋œ๋‹ค.

git config --global core.autocrlf true
โš ๏ธ **GitHub.com Fallback** โš ๏ธ