#
๋น ๋ธ๋์น ์์ฑํ๊ธฐgit checkout --orphan empty-branch
git rm -rf .
# ๋น ์ปค๋ฐ ์์ฑํ๊ธฐgit commit --allow-empty -m "Initial commit"
#
Git Pull ์ ๋ตgit pull
์ ๋ณ๋ ์ต์
์์ด ์คํํ์ ๋ ๊ฒฝ๊ณ ๋ฌธ๊ตฌ๊ฐ ๋ํ๋ฌ๋ค.
warning: Pulling without specifying how to reconcile divergent branches isdiscouraged. You can squelch this message by running one of the followingcommands sometime before your next pull:
git config pull.rebase false # merge (the default strategy)git config pull.rebase true # rebasegit config pull.ff only # fast-forward only
You can replace "git config" with "git config --global" to set a defaultpreference for all repositories. You can also pass --rebase, --no-rebase,or --ff-only on the command line to override the configured default perinvocation.
default (merge) : ๋ก์ปฌ ๋ธ๋์น์ ๋ฆฌ๋ชจํธ ๋ธ๋์น์ Head๊ฐ ๋ค๋ฅธ ์์น์ ์์ ๋,
pull
๋ฐ์ผ๋ฉด, Merge ์ปค๋ฐ์ ์์ฑํจ.rebase : ๋ก์ปฌ ๋ธ๋์น์ ๋ฆฌ๋ชจํธ ๋ธ๋์น์ Head๊ฐ ๋ค๋ฅธ ์์น์ ์์ ๋,
pull
๋ฐ์ผ๋ฉด, ๋ฆฌ๋ชจํธ ๋ธ๋์น๋ฅผrebase
ํ์ฌ history๋ฅผ ์ ๋ฆฌํจ.fast-forward only : fast-forward ๊ด๊ณ์ ์์ ๋๋ง
pull
์ ํ์ฉํจ.
[GIT] Git pull ์ ๋ต (default, --ff -only, --rebase)
GitHub ํ๊ฒฝ์์์ ์ค์ Git ๋ ์ํผ : NHN Cloud Meetup