{"id":3677,"date":"2020-09-17T00:41:31","date_gmt":"2020-09-16T15:41:31","guid":{"rendered":"\/blog\/?p=3677"},"modified":"2023-09-21T09:26:38","modified_gmt":"2023-09-21T00:26:38","slug":"git","status":"publish","type":"post","link":"https:\/\/hasu0707.duckdns.org\/blog\/?p=3677","title":{"rendered":"git \uc790\ub8cc \uc815\ub9ac"},"content":{"rendered":"\n
\"\"
Git Architecture-1<\/figcaption><\/figure>\n\n\n\n
\"\"
Git Architecture-2<\/figcaption><\/figure>\n\n\n\n
\"\"
Git Architecture-3<\/figcaption><\/figure>\n\n\n\n\ucd9c\ucc98: https:\/\/github.com\/jeonghwan-kim\/git-usage<\/a>

\uad6c\uc870<\/span>
\ucf54\ub4dc\ub294 \uc544\ub798 \uc138 \ub2e8\uacc4\uc5d0 \uac78\uccd0 \uc800\uc7a5\ub41c\ub2e4.

\uc2a4\ud14c\uc774\uc9d5 -> \ucee4\ubc0b -> \uc6d0\uaca9\uc800\uc7a5\uc18c

git add {\ud30c\uc77c\uba85} \uc73c\ub85c \ud30c\uc77c\uc744 \uc2a4\ud14c\uc774\uc9d5 \uc0c1\ud0dc\uc5d0 \ub123\ub294\ub2e4.
git commit \uc73c\ub85c \uc2a4\ud14c\uc774\uc9d5 \uc0c1\ud0dc\uc5d0 \uc788\ub294 \ubaa8\ub4e0 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ucee4\ubc0b\ud55c\ub2e4. \uc5ec\uae30\uae4c\uc9c0\uac00 \ub85c\uceec\uc5d0\uc11c\uc758 \uc791\uc5c5
git push \ub85c \ucee4\ubc0b\ub41c \uc800\uc7a5\uc18c\ub97c \uc6d0\uaca9 \uc800\uc7a5\uc18c\ub85c \ubc00\uc5b4\ub123\ub294\ub2e4.

\uae30\ubcf8 \uba85\ub839\uc5b4<\/span>

\uc800\uc7a5\uc18c \uc0dd\uc131

git init
\uc6d0\uaca9 \uc800\uc7a5\uc18c\ub85c\ubd80\ud130 \ubcf5\uc81c

git clone {url}
\ubcc0\uacbd \uc0ac\ud56d \uccb4\ud06c

git status \/\/
\ud2b9\uc815 \ud30c\uc77c \uc2a4\ud14c\uc774\uc9d5

git add {\ud30c\uc77c\uba85}
\ubcc0\uacbd\ub41c \ubaa8\ub4e0 \ud30c\uc77c \uc2a4\ud14c\uc774\uc9d5

git add *
\ucee4\ubc0b

git commit -m “{\ubcc0\uacbd \ub0b4\uc6a9}”
\uc6d0\uaca9\uc73c\ub85c \ubcf4\ub0b4\uae30

git push origin master
\uc6d0\uaca9\uc800\uc7a5\uc18c \ucd94\uac00

git remote add origin {\uc6d0\uaca9\uc11c\ubc84\uc8fc\uc18c}
\ucc38\uace0 \ud398\uc774\uc9c0

download(osx): http:\/\/code.google.com\/p\/git-osx-installer\/downloads\/list
download(windows): http:\/\/git-scm.com\/download\/win
\uc124\uce58 \uba54\ub274\uc5bc: http:\/\/blog.outsider.ne.kr\/389
\uc0ac\uc6a9 \uba54\ub274\uc5bc: http:\/\/dogfeet.github.io\/articles\/2012\/how-to-github.html
git \uac04\ud3b8 \uc548\ub0b4\uc11c: http:\/\/rogerdudler.github.com\/git-guide\/index.ko.html
\ud55c\uc7a5\uc73c\ub85c \ud575\uc2ec \uae30\ub2a5\ub9cc: http:\/\/rogerdudler.github.com\/git-guide\/files\/git_cheat_sheet.pdf



Commit<\/span>
\ucee4\ubc0b \ud569\uce58\uae30

git rebase -i HEAD~4 \/\/ \ucd5c\uc2e0 4\uac1c\uc758 \ucee4\ubc0b\uc744 \ud558\ub098\ub85c \ud569\uce58\uae30
\ucee4\ubc0b \uba54\uc138\uc9c0 \uc218\uc815

$ git commit --amend \/\/ \ub9c8\uc9c0\ub9c9 \ucee4\ubc0b\uba54\uc138\uc9c0 \uc218\uc815(ref)
\uac04\ub2e8\ud55c commit\ubc29\ubc95

$ git add {\ubcc0\uacbd\ud55c \ud30c\uc77c\ubcd1}
$ git commit -m “{\ubcc0\uacbd \ub0b4\uc6a9}\"
\ucee4\ubc0b \uc774\ub825 \ud655\uc778

$ git log \/\/ \ubaa8\ub4e0 \ucee4\ubc0b\ub85c\uadf8 \ud655\uc778
$ git log -3 \/\/ \ucd5c\uadfc 3\uac1c \ucee4\ubc0b\ub85c\uadf8 \ud655\uc778
$ git log --pretty=oneline \/\/ \uac01 \ucee4\ubc0b\uc744 \ud55c \uc904\ub85c \ud45c\uc2dc
$ git reflog \/\/ reset \ud639\uc740 rebase\ub85c \uc5c6\uc5b4\uc9c4 \uacfc\uac70\uc758 \ucee4\ubc0b \uc774\ub825 \ud655\uc778
\ucee4\ubc0b \ucde8\uc18c

$ git reset HEAD^ \/\/ \ub9c8\uc9c0\ub9c9 \ucee4\ubc0b \uc0ad\uc81c
$ git reset --hard HEAD \/\/ \ub9c8\uc9c0\ub9c9 \ucee4\ubc0b \uc0c1\ud0dc\ub85c \ub418\ub3cc\ub9bc
$ git reset HEAD * \/\/ \uc2a4\ud14c\uc774\uc9d5\uc744 \uc5b8\uc2a4\ud14c\uc774\uc9d5\uc73c\ub85c \ubcc0\uacbd, ref



Branch<\/span>
master \ube0c\ub79c\uce58\ub97c \ud2b9\uc815 \ucee4\ubc0b\uc73c\ub85c \uc62e\uae30\uae30

git checkout better_branch
git merge --strategy=ours master    # keep the content of this branch, but record a merge
git checkout master
git merge better_branch            # fast-forward master up to the merge
\ube0c\ub79c\uce58 \ubaa9\ub85d

$ git branch \/\/ \ub85c\uceec
$ git branch -r \/\/ \ub9ac\ubaa8\ud2b8
$ git branch -a \/\/ \ub85c\uceec, \ub9ac\ubaa8\ud2b8 \ud3ec\ud568\ub41c \ubaa8\ub4e0 \ube0c\ub79c\uce58 \ubcf4\uae30
\ube0c\ub79c\uce58 \uc0dd\uc131

git branch new master \/\/ master -> new \ube0c\ub79c\uce58 \uc0dd\uc131
git push origin new \/\/ new \ube0c\ub79c\uce58\ub97c \ub9ac\ubaa8\ud2b8\ub85c \ubcf4\ub0b4\uae30
\ube0c\ub79c\uce58 \uc0ad\uc81c

git branch -D {\uc0ad\uc81c\ud560 \ube0c\ub79c\uce58 \uba85} \/\/ local
git push origin :{the_remote_branch} \/\/ remote
\ube48 \ube0c\ub79c\uce58 \uc0dd\uc131

$ git checkout --orphan {\uc0c8\ub85c\uc6b4 \ube0c\ub79c\uce58 \uba85}
$ git commit -a \/\/ \ucee4\ubc0b\ud574\uc57c \uc0c8\ub85c\uc6b4 \ube0c\ub79c\uce58 \uc0dd\uc131\ub428
$ git checkout -b new-branch \/\/ \ube0c\ub79c\uce58 \uc0dd\uc131\uacfc \ub3d9\uc2dc\uc5d0 \uccb4\ud06c\uc544\uc6c3
\ub9ac\ubaa8\ud2b8 \ube0c\ub79c\uce58 \uac00\uc838\uc624\uae30

$ git checkout -t origin\/{\uac00\uc838\uc62c \ube0c\ub79c\uce58\uba85} \/\/ ref
\ube0c\ub79c\uce58 \uc774\ub984 \ubcc0\uacbd

$ git branch -m {new name} \/\/ ref



Tag<\/span>
\ud0dc\uadf8 \uc0dd\uc131

git tag -a {tag name} -m {tag message} {commit hash}
git tag {tag name} {tag name} -f -m \"{new message}\" \/\/ Edit tag message
\ud0dc\uadf8 \uc0ad\uc81c

git tag -d {tag name}
git push origin :tags\/{tag name} \/\/ remote
\ud0dc\uadf8 \ud478\uc2dc

git push origin --tags
git push origin {tag name}
git push --tags



\uae30\ud0c0<\/span>
\ud30c\uc77c \uc0ad\uc81c

git rm --cached --ignore-unmatch [\uc0ad\uc81c\ud560 \ud30c\uc77c\uba85]
\ud788\uc2a4\ud1a0\ub9ac \uc0ad\uc81c

\ubaa9\uc801: \ud328\uc2a4\uc6cc\ub4dc, \uc544\uc774\ub514 \uac19\uc740 \ube44\uacf5\uac1c \uc815\ubcf4\uac00 \ub2f4\uae34 \ud30c\uc77c\uc744 \uc2e4\uc218\ub85c \uc62c\ub838\uc744 \ub54c \uc0ad\uc81c\ud558\ub294 \ubc29\ubc95\uc774\ub2e4. (history\uc5d0\uc11c\ub3c4 \ud574\ub2f9 \ud30c\uc77c\ub9cc \uc0ad\uc81c)
$ git clone [url] # \uc18c\uc2a4 \ub2e4\uc6b4\ub85c\ub4dc
$ cd [foler_name] # \ud574\ub2f9 \ud3f4\ub354 \uc774\ub3d9
$ git filter-branch --index-filter 'git rm --cached --ignore-unmatch [\uc0ad\uc81c\ud560 \ud30c\uc77c\uba85]' --prune-empty -- --all # \ubaa8\ub4e0 \ud788\uc2a4\ud1a0\ub9ac\uc5d0\uc11c \ud574\ub2f9 \ud30c\uc77c \uc0ad\uc81c
$ git push origin master --force # \uc11c\ubc84\ub85c \uc804\uc1a1
\ud788\uc2a4\ud1a0\ub9ac\uc5d0\uc11c \ud3f4\ub354 \uc0ad\uc81c:

git filter-branch --tree-filter 'rm -rf vendor\/gems' HEAD
\ub9ac\ubaa8\ud2b8 \uc8fc\uc18c \ucd94\uac00\ud558\uc5ec \ub85c\uceec\uc5d0 \uc2f1\ud06c\ud558\uae30

$ git remote add upstream {\ub9ac\ubaa8\ud2b8 \uc8fc\uc18c}
$ git pull upstream {\ube0c\ub79c\uce58\uba85}
\ucd5c\uc801\ud654

$ git gc
$ git gc --aggressive



\uc11c\ubc84 \uc124\uc815<\/span>
\uac15\uc81c \ud478\uc2dc \uc124\uc815

git config receive.denynonfastforwards false

Alias
~\/.gitconfig \ud30c\uc77c\uc744 \uc124\uc815\ud558\uc5ec Git \uba85\ub839\uc5b4\uc758 \uc568\ub9ac\uc5b4\uc2a4\ub97c \uc9c0\uc815\ud560 \uc218 \uc788\ub2e4.

~\/.gitconfig > alias \ubd80\ubd84:


[alias]
  br = branch
  co = checkout
  rb = rebase
  st = status
  cm = commit
  pl = pull
  ps = push
  lg = log --graph --abbrev-commit --decorate --format=format:'%C(cyan)%h%C(reset) - %C(green)(%ar)%C(reset)  %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(yellow)%d%C(reset)' --all
  ad = add
  tg = tag
  df = diff

\u25a0git \ud55c\uae00 \ub9e4\ub274\uc5bc<\/span>
https:\/\/git-scm.com\/book\/ko\/v2\/


\u25a0git config \uc815\ub9ac<\/span>
REM \uc0ac\uc6a9\uc790 \uc774\ub984 \ubc0f \uc774\uba54\uc77c
git config --global user.name \"Your name\"
git config --global user.email \"Your email address\"

REM \uc124\uc815 \uc870\ud68c
git config --global --list
git config --list

REM \ucd9c\ub825 \uc0c9\uc0c1 \ud65c\uc131\ud654
git config --global color.ui \"auto\"

REM \uac1c\ud589\ubb38\uc790 \ubcc0\uacbd \ube44\ud65c\uc131\ud654
git config --global core.autocrlf false

REM SSL \uc0ac\uc6a9 \ube44\ud65c\uc131\ud654
git config --global http.sslVerify false

REM \uc778\uc99d\uc11c \uc124\uc815
git config --system http.sslcainfo \"C:\\PortableApps\\cmd_git\\mingw32\\ssl\\certs\\ca-bundle.crt\"

REM \uc5d0\ub514\ud130 \uc124\uc815
git config --global core.editor \"'C:\\PortableApps\\Notepad++Portable\\notepad++.exe' -multiInst -nosession\"



\u25a0github \ud328\uc2a4\uc6cc\ub4dc \ucd08\uae30\ud654<\/span>
git credential reject
protocol=https
host=github.com
<\uc5d4\ud130>



\u25a0github \uc800\uc7a5\uc18c \ucd08\uae30\ud654<\/span>
RMDIR \/S \/Q .git

REM recreate the repos from the current content only
git init
git add .
git commit -m \"Initial commit\"

REM  push to the github remote repos ensuring you overwrite history
git remote add origin \"git@github.com:kildong\/test.git\"
git push -u --force origin master



\u25a0git \ucee4\ub9e8\ub4dc \uc815\ub9ac<\/span>
  \u25cegit init
    \ub85c\uceec\uc800\uc7a5\uc18c initialize
    : .git \ud3f4\ub354\uac00 \uc0dd\uae34\ub2e4. (.git \ud3f4\ub354 \uc5c6\uc73c\uba74 \ubc84\uc804\uad00\ub9ac \ub418\uc9c0 \uc54a\uc74c.)
    : \uc9c0\uc815\ud55c \ub85c\uceec \uc800\uc7a5\uc18c\uac00 \uc5c6\uc73c\uba74 \uc0c8\ub85c \uc0dd\uc131 + \ucd08\uae30\ud654
    git init [\ub85c\uceec\uc800\uc7a5\uc18c\uc704\uce58]

    \ud604\uc7ac \uc704\uce58 \ub85c\uceec\uc800\uc7a5\uc18c initialize
    git init .



  \u25cegit status
    \ud604\uc7ac \uc0c1\ud0dc \ud655\uc778
    : pull \ub610\ub294 push \ud560 \ub0b4\uc6a9\uc774 \uc788\ub294\uc9c0 \ub4f1\ub4f1 \uc54c \uc218 \uc788\ub2e4.
    git status



  \u25cegit diff
    \ubc14\ub010 \ubd80\ubd84 \ubcf4\uae30
    git diff



  \u25cegit add
    \ud30c\uc77c\uc744 Staging Area\uc5d0 \uc62c\ub9ac\uae30
    git add [\ud30c\uc77c\uc774\ub984]

    \ud604\uc7ac \ub514\ub809\ud1a0\ub9ac\uc5d0 \uc788\ub294 \ubaa8\ub4e0 \ud30c\uc77c\uc744 add
    git add .



  \u25cegit commit
    \ucee4\ubc0b \uba54\uc2dc\uc9c0\uc640 \ud568\uaed8 \ub4f1\ub85d
    git commit -m \"\ucee4\ubc0b\uba54\uc2dc\uc9c0\"

    add\uc640 commit\uc744 \ub3d9\uc2dc\uc5d0
    : \ucc98\uc74c \uc0dd\uc131\ud55c \ud30c\uc77c\uc740 \ucd94\uc801\ub418\uc9c0 \uc54a\ub294 \uc0c1\ud0dc\uc774\uae30 \ub54c\ubb38\uc5d0, \ucd5c\ucd08 \ud55c \ubc88\uc740 add \ud574\uc57c \ud55c\ub2e4.
    git commit -am \"\ucee4\ubc0b\uba54\uc2dc\uc9c0\"

    \uc5d0\ub514\ud130\ub85c \ucee4\ubc0b \uba54\uc2dc\uc9c0 \uc791\uc131
    : \uc5ec\ub7ec \uc904\uc758 \ucee4\ubc0b \uba54\uc2dc\uc9c0\ub97c \ud3b8\ud558\uac8c \uc791\uc131 \uac00\ub2a5\ud558\ub2e4.
    git commit

    \ubc14\ub85c \uc9c1\uc804 \ucee4\ubc0b \uba54\uc2dc\uc9c0 \uc218\uc815
    1) git commit --amend
    2) \uc5d0\ub514\ud130\ub85c \uc218\uc815 \ud6c4 \uc800\uc7a5
    3) git push -f (-f \uc635\uc158\uc744 \ub123\uc5b4\uc918\uc57c \uac15\uc81c\ub85c \ub36e\uc5b4 \uc50c\uc6cc\uc9c4\ub2e4. \ub300\uc2e0 \uc6d0\uaca9\uc800\uc7a5\uc18c\ub97c \ub0b4 \ub85c\uceec\uc800\uc7a5\uc18c\uc640 \ub611\uac19\uc774 \ub9cc\ub4dc\ub2c8\uae4c \uc870\uc2ec\ud574\uc57c\ud55c\ub2e4. \uadf8\ub0e5 \ucee4\ubc0b\ud560 \ub54c \uc870\uc2ec\ud558\uc790)



  \u25cegit log
    \ubc84\uc804 History \ubcf4\uae30 (commit history \ud655\uc778)
    git log

    \ud1b5\uacc4 \ud655\uc778 (\uba87 \uc904\uc774 \ucd94\uac00 \ub418\uc5c8\uace0, \uba87 \uc904\uc774 \uc0ad\uc81c\ub418\uc5c8\uace0)
    git log --stat

    \ucee4\ubc0b \uba54\uc2dc\uc9c0, \uc218\uc815\ub41c \ubd80\ubd84 \ud568\uaed8 \ubcf4\uae30
    git log -p

    \ubaa8\ub4e0 \ube0c\ub79c\uce58 history \ubcf4\uae30
    git log -all

    \uc2dc\uac01\uc801\uc73c\ub85c \ud655\uc778
    git log --graph

    \ud55c \uc904\ub85c \ud45c\uc2dc
    git log --oneline

    \ud3ec\ub9f7\ud305
    git log --pretty=format:\"%h -> %an, %ar : %s\"
    %h: commit id (hash)
    %an: author
    %ar: \uc5b8\uc81c \ud588\ub294\uc9c0
    %s: \uba54\uc2dc\uc9c0



  \u25cegit reset
    \ubc84\uc804 \ub418\ub3cc\ub9ac\uae30 (\uac70\uc758 \uc0ad\uc81c\uc640 \ube44\uc2b7)
    : \ud611\uc5c5 \uc0c1\ud0dc\uc5d0\uc11c \uc774\ubbf8 \uacf5\uc720\ub41c \ubc84\uc804\uc744 reset \ud558\uba74 \uc548 \ub41c\ub2e4.
    git reset

    staging area\uc5d0 \uc788\ub294 \ud30c\uc77c \ub0b4\ub9ac\uae30
    git reset \ud30c\uc77c\uba85

    \uc774\uc804 \ucee4\ubc0b \uc0c1\ud0dc\ub85c \ub3cc\uc544\uac00\uae30
    git reset --hard [commit id]
    : --hard => \uadf8 \uc774\ud6c4 \ucee4\ubc0b\uc740 \ubaa8\ub450 \uc5c6\ub358\uac70\ub85c \uccd0\ubc84\ub9ac\uaca0\ub2e4. (\ucee4\ubc0b \ub0b4\uc5ed \uc0ad\uc81c\ub428.)
    : --soft => \ud574\ub2f9 \ucee4\ubc0b\uc73c\ub85c \ub418\ub3cc\uc544\uac00\uc9c0\ub9cc, \uadf8 \uc774\ud6c4 \ucee4\ubc0b\uacfc \uad00\ub828\ub41c \ud30c\uc77c\ub4e4 (\uc218\uc815\ub418\uac70\ub098 \uc0ad\uc81c\ub418\uac70\ub098 \ucd94\uac00\ub418\uac70\ub098..)\uc740 \ubcf4\uc874\ud55c\ub2e4.
    : \uc774\ubbf8 push\ud55c \ub0b4\uc5ed\uc5d0 \ub300\ud574\uc11c reset \ud55c\ub2e4\uba74, reset \ud6c4 push\uac00 \uc548\ub41c\ub2e4. (\uc0c1\ud0dc\uac00 \uc644\uc804 \ub2ec\ub77c\uc838\ubc84\ub824\uc11c) => git push -f\ud558\uba74 \uc6d0\uaca9\uc800\uc7a5\uc18c\uc5d0\ub3c4 \ubc18\uc601\ub41c\ub2e4.



  \u25cegit revert
    \ub418\ub3cc\ub9ac\uae30\ub97c \ud3ec\ud568\ud558\uba74\uc11c \ub418\ub3cc\ub9b0 \ub0b4\uc6a9\uc744 \ubcf4\uc874\ud558\ub294 \uc138\ub828\ub41c \uce5c\uad6c
    : \uc5ed\uc21c\uc73c\ub85c revert \ud574\uc57c \ud55c\ub2e4.
    git revert [revert \ub420 commit id]



  \u25cegit branch
    : \uae30\ubcf8\uc801\uc73c\ub85c Git \uc800\uc7a5\uc18c\ub97c \ub9cc\ub4e4\uba74 \uc790\ub3d9\uc73c\ub85c \ub9c8\uc2a4\ud130(master) \ube0c\ub79c\uce58\uac00 \uc0dd\uc131\ub41c\ub2e4. \uc774 \ube0c\ub79c\uce58\ub294 \uc77c\ubc18\uc801\uc73c\ub85c \ubc30\ud3ec\uac00 \uac00\ub2a5\ud55c \uc218\uc900\uc758 \uc548\uc815\ud654\ub41c \ubc84\uc804\uc744 \ud3ec\ud568\ud558\uace0 \uc788\ub2e4.

    master branch---develop branch
             \\---bug fix branch
    \ube0c\ub79c\uce58 \ubaa9\ub85d \ubcf4\uae30
    : \ud604\uc7ac \ube0c\ub79c\uce58\ub294 * \ub85c \ud45c\uc2dc
    git branch

    \ube0c\ub79c\uce58 \uc0dd\uc131
    : \ud604\uc7ac \ube0c\ub79c\uce58\ub97c \uae30\uc900\uc73c\ub85c \ubcf5\uc0ac\ud574\uc11c \ub9cc\ub4e0\ub2e4.
    git branch [\ube0c\ub79c\uce58\uc774\ub984]

    \ube0c\ub79c\uce58 \uc81c\uac70
    : \ubcd1\ud569\uc774 \ub05d\ub09c \ube0c\ub79c\uce58\ub294 \uc81c\uac70\ud574\uc8fc\uc790.
    git branch -d [branch]



  \u25cegit checkout
    \ube0c\ub79c\uce58 \uc774\ub3d9
    git checkout [\ube0c\ub79c\uce58\uc774\ub984]

    \uc6d0\uaca9 \uc800\uc7a5\uc18c\uc758 \ube0c\ub79c\uce58\ub97c \uac00\uc838\uc624\uba74\uc11c \uadf8 \ube0c\ub79c\uce58\ub85c \uc774\ub3d9
    git checkout -b [\uc0dd\uc131\ud560 \ube0c\ub79c\uce58] [\uac00\uc838\uc62c \uc6d0\uaca9\ube0c\ub79c\uce58]

    not staged \ud658\uacbd\uc5d0\uc11c, \uc218\uc815\ub41c \ub0b4\uc6a9 \ub418\ub3cc\ub9ac\uae30
    git checkout -- [file]



  \u25cegit merge
    \ube0c\ub79c\uce58 \ubcd1\ud569
    ex) o2 \ube0c\ub79c\uce58\ub97c master \ube0c\ub79c\uce58\ub85c \ud569\uce58\uaca0\ub2e4.
    master \ube0c\ub79c\uce58\ub85c \uc774\ub3d9
    git checkout master

    \ud604\uc7ac \ube0c\ub79c\uce58(master)\ub85c \ubcd1\ud569\ud558\uace0 \uc2f6\uc740 \ube0c\ub79c\uce58\ub97c \ub561\uaca8\uc628\ub2e4.
    git merge o2

    \ubcd1\ud569\ub41c \uc0c8\ub85c\uc6b4 \ubc84\uc804\uc758 \ucee4\ubc0b \uba54\uc2dc\uc9c0 \uc785\ub825

    \ubcd1\ud569 \uc644\ub8cc


    \ucda9\ub3cc \ud574\uacb0 \ud6c4 \ubcd1\ud569
    \/\/  \ucda9\ub3cc \ud30c\uc77c \uc608\uc2dc
    #Title
    content
    <<<<<<< HEAD
    master
    ======= (\uad6c\ubd84\uc790)
    o2
    >>>>>>> o2
    \ucda9\ub3cc \ud574\uacb0 \ubc29\ubc95
    \ucda9\ub3cc \ud574\uacb0\ud558\uace0 \ud30c\uc77c \uc800\uc7a5 > git add [\ucda9\ub3cc\ud30c\uc77c] > git commit > \ucda9\ub3cc \ud574\uacb0 \uc644\ub8cc

    \uc678\ubd80 \ub3c4\uad6c\ub97c \uc774\uc6a9\ud55c \ubcd1\ud569
    : \uae30\uc874\uc5d0 \uc14b\ud305 \ud574\ub450\uc5b4\uc57c \ud55c\ub2e4.
    : ex) p4Merge
    git mergetool


    \ucee4\ubc0b \uba54\uc2dc\uc9c0\ub97c \ub0a8\uae30\ub294 merge
    git merge --no-ff <\uba38\uc9c0\ud560 \ube0c\ub79c\uce58>



  \u25cegit remote
    \uc6d0\uaca9 \uc800\uc7a5\uc18c \ubaa9\ub85d
    git remote

    \uc6d0\uaca9 \uc800\uc7a5\uc18c \ubaa9\ub85d + \uc6d0\uaca9 \uc800\uc7a5\uc18c \uc8fc\uc18c
    git remote -v

    \uc6d0\uaca9 \uc800\uc7a5\uc18c \uc0c1\uc138\ubcf4\uae30
    git remote show [\uc6d0\uaca9\uc800\uc7a5\uc18c\uc774\ub984]

    \uc6d0\uaca9 \uc800\uc7a5\uc18c \ucd94\uac00
    : \ud558\ub098\uc758 \ub85c\uceec \uc800\uc7a5\uc18c\ub97c \uc5ec\ub7ec \uac1c\uc758 \uc6d0\uaca9 \uc800\uc7a5\uc18c\uc640 \uc5f0\uacb0 \ud560 \uc218 \uc788\uae30 \ub54c\ubb38\uc5d0 \uc6d0\uaca9 \uc800\uc7a5\uc18c\uc5d0 \ubcc4\uba85\uc744 \ubd99\uc5ec\uc900\ub2e4. (\uc8fc\ub85c \ud558\ub098\uc758 \ub85c\uceec \uc800\uc7a5\uc18c\uc5d0 \ud558\ub098\uc758 \uc6d0\uaca9 \uc800\uc7a5\uc18c\ub97c \uc5f0\uacb0 \ud558\uae30 \ub54c\ubb38\uc5d0 origin\uc744 \ubcc4\uba85\uc73c\ub85c \ub9ce\uc774 \uc4f4\ub2e4.)
    git remote add [\uc6d0\uaca9 \uc800\uc7a5\uc18c \ubcc4\uba85] [\uc6d0\uaca9 \uc800\uc7a5\uc18c \uc8fc\uc18c]

    \uc6d0\uaca9 \uc800\uc7a5\uc18c \uc774\ub984 \ubc14\uafb8\uae30
    git remote rename [\ud604\uc7ac\uc774\ub984] [\ubc14\uafc0\uc774\ub984]

    \uc6d0\uaca9 \uc800\uc7a5\uc18c \uc0ad\uc81c
    git remote rm [\uc6d0\uaca9\uc800\uc7a5\uc18c\uc774\ub984]



  \u25cegit push
    origin \uc800\uc7a5\uc18c\uc758 master \ube0c\ub79c\uce58\ub85c push
    git push -u origin master



  \u25cegit pull
    origin \uc800\uc7a5\uc18c\uc758 master \ube0c\ub79c\uce58 \ub0b4\uc6a9 \uac00\uc838\uc624\uae30
    git pull origin master



  \u25cegit clone
    \uc6d0\uaca9 \uc800\uc7a5\uc18c \ub0b4\uc6a9\uc744 \ub85c\uceec \uc800\uc7a5\uc18c\ub85c \ubcf5\uc81c\ud558\uae30
    : \ud604\uc7ac \uc704\uce58\ub85c \uac00\uc838\uc628\ub2e4.
    git clone [\uc6d0\uaca9 \uc800\uc7a5\uc18c]



  \u25cegit stash
    \ud558\ub358 \uc791\uc5c5 \uc784\uc2dc\ub85c \uc800\uc7a5\ud558\uae30
    git stash

    stash \ubaa9\ub85d \ud655\uc778\ud558\uae30
    git stash list

    \uc784\uc2dc \uc800\uc7a5 \ud588\ub358 \uac83 \ub2e4\uc2dc \uc801\uc6a9\ud558\uae30
    git stash apply

    stash \uc81c\uac70\ud558\uae30
    : \uc801\uc6a9\ud588\uc9c0\ub9cc \ubaa9\ub85d\uc5d0\ub294 \ub0a8\uc544\uc788\uc74c. \ub530\ub77c\uc11c \uc81c\uac70 \ud574\uc8fc\uc5b4\uc57c \ud568.
    git stash drop



  \u25cegit archive
    : git \ub808\ud30c\uc9c0\ud1a0\ub9ac\uc5d0 \uc788\ub294 \uc18c\uc2a4\ucf54\ub4dc\ub9cc \uc555\ucd95
    git archive --format=zip master -o Master.zip
    => \ub9c8\uc2a4\ud130 \ube0c\ub79c\uce58\ub97c zip \ud615\uc2dd\uc73c\ub85c Master.zip\uc73c\ub85c \ucd94\ucd9c
    => .git \ud3f4\ub354\ub294 \ucd94\ucd9c\ub418\uc9c0 \uc54a\uc74c.
    => Master.zip \uc790\ub9ac\uc5d0 \uc0c1\ub300\uacbd\ub85c \uac00\ub2a5 (..\/Master.zip \uc774\ub77c\uace0 \ub123\uc73c\uba74 \uc0c1\uc704 \ub514\ub809\ud1a0\ub9ac\uc5d0 \ucd94\ucd9c\ub428)

\u25a0ID\/PW \uc778\uc99d<\/span>
  git clone https:\/\/[\uc0ac\uc6a9\uc790ID]:[\ube44\ubc00\ubc88\ud638]@[git\uc8fc\uc18c]
  git clone https:\/\/username:password@github.com\/username\/repository.git

\u25a0\uc778\uc99d\uae30\uad00 \uc778\uc99d\uc11c(CA Certificate) \uc815\ubcf4 \ud655\uc778<\/span>
  git config --global http.sslCAInfo

\u25a0\uc778\uc99d\uae30\uad00 \uc778\uc99d\uc11c(CA Certificate) \uc704\uce58 \uc9c0\uc815<\/span>
  git config --global http.sslCAInfo d:\/devel\/my-ca-bundle.crt

\u25c6\uc774\uc288:<\/span>
  > git clone https:\/\/github.com\/theswice\/theswice_temp.git
  Cloning into 'theswice_temp.git'...
  fatal: unable to access 'https:\/\/github.com\/theswice\/theswice_temp.git\/':
  SSL certificate problem: unable to get local issuer certificate

-->\ud574\uacb0 \ubc29\ubc95:
  git config --global http.sslVerify false
  \ub610\ub294
  export GIT_SSL_NO_VERIFY=0<\/span>\n\n\n\n
\n\n\n\n
@ECHO OFF\nREM #################################################################\nREM #\nREM # \uc2e0\uaddc \uc18c\uc2a4\ucf54\ub4dc\ub97c github\uc5d0 push\ud55c\ub2e4.\nREM #\nREM # github\uc5d0\uc11c repository\ub294 \ubbf8\ub9ac \uc0dd\uc131\ub418\uc5b4 \uc788\uc5b4\uc57c \ud55c\ub2e4.\nREM #\nREM #################################################################\n\nREM =======================================\nREM \u25a0 CODEPAGE\ub97c UTF-8\ub85c \ubcc0\uacbd\nREM =======================================\nCHCP 65001 1> NUL 2> NUL\n\nSET \"CURR_DIR=%CD%\"\n\nREM #################################################################\nREM #\nREM # \ud568\uc218 \ud638\ucd9c\nREM #\nREM #################################################################\nCALL :FUNC_GIT_NEWPUSH \"d:\\0_tmp\\src\\esecu_utm\" \"esecu_utm\" \"esecu_utm\" \"eSecuVali Corp.\"\n\nCD \/D %CURR_DIR%\nEXIT \/B %ERRORLEVEL%\n\nREM #################################################################\nREM #\nREM # git\uc744 \ucd08\uae30\ud654\ud558\uace0 \ud574\ub2f9 \ub514\ub809\ud1a0\ub9ac\ub97c \ubaa8\ub450 push \ud55c\ub2e4.\nREM #\nREM # %1: \uc18c\uc2a4 \ub514\ub809\ud1a0\ub9ac\nREM # %2: branch\nREM # %3: github remote repository\nREM # %4: comment\nREM #\nREM #################################################################\n:FUNC_GIT_NEWPUSH\n    CD \/D %1\n    RMDIR \/S \/Q .git\n    git init\n    git config --global core.autocrlf false\n    git config pull.rebase true\n    git config credential.helper store --global\n    git config --global http.sslVerify false\n    git config --global user.email \"gitest@github.com\"\n    git config --global user.name \"Hong Kil-Dong\"\n    git config --system http.sslcainfo \"C:\\PortableApps\\cmd_git\\mingw32\\ssl\\certs\\ca-bundle.crt\"\n    git config --global core.editor \"'C:\\PortableApps\\Notepad++Portable\\notepad++.exe' -multiInst -nosession\"\n    git remote add origin \"https:\/\/github.com\/kildong\/%3.git\"\n\n    git add *\n    git commit -m %4\n    git branch %2\n    git checkout %2\n\n    git pull origin %2\n    git push --force --set-upstream origin %2\n    REM git push --set-upstream origin %2\nEXIT \/B \/0<\/pre>\n","protected":false},"excerpt":{"rendered":"
\ucd9c\ucc98: https:\/\/github.com\/jeonghwan-kim\/git-usage \uad6c\uc870\ucf54\ub4dc\ub294 \uc544\ub798 \uc138 \ub2e8\uacc4\uc5d0 \uac78\uccd0 \uc800\uc7a5\ub41c\ub2e4. \uc2a4\ud14c\uc774\uc9d5 -> \ucee4\ubc0b -> \uc6d0\uaca9\uc800\uc7a5\uc18c git add {\ud30c\uc77c\uba85} \uc73c\ub85c \ud30c\uc77c\uc744 \uc2a4\ud14c\uc774\uc9d5 \uc0c1\ud0dc\uc5d0 \ub123\ub294\ub2e4.git commit \uc73c\ub85c \uc2a4\ud14c\uc774\uc9d5 \uc0c1\ud0dc\uc5d0 \uc788\ub294 \ubaa8\ub4e0 \ubcc0\uacbd\uc0ac\ud56d\uc744 \ucee4\ubc0b\ud55c\ub2e4. \uc5ec\uae30\uae4c\uc9c0\uac00 \ub85c\uceec\uc5d0\uc11c\uc758 \uc791\uc5c5git push \ub85c \ucee4\ubc0b\ub41c \uc800\uc7a5\uc18c\ub97c \uc6d0\uaca9 \uc800\uc7a5\uc18c\ub85c \ubc00\uc5b4\ub123\ub294\ub2e4. \uae30\ubcf8 \uba85\ub839\uc5b4 \uc800\uc7a5\uc18c \uc0dd\uc131 git init\uc6d0\uaca9 \uc800\uc7a5\uc18c\ub85c\ubd80\ud130 \ubcf5\uc81c git clone {url}\ubcc0\uacbd \uc0ac\ud56d \uccb4\ud06c git status \/\/\ud2b9\uc815 […]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_import_markdown_pro_load_document_selector":0,"_import_markdown_pro_submit_text_textarea":"","site-sidebar-layout":"default","site-content-layout":"","ast-site-content-layout":"","site-content-style":"default","site-sidebar-style":"default","ast-global-header-display":"","ast-banner-title-visibility":"","ast-main-header-display":"","ast-hfb-above-header-display":"","ast-hfb-below-header-display":"","ast-hfb-mobile-header-display":"","site-post-title":"","ast-breadcrumbs-content":"","ast-featured-img":"","footer-sml-layout":"","theme-transparent-header-meta":"","adv-header-id-meta":"","stick-header-meta":"","header-above-stick-meta":"","header-main-stick-meta":"","header-below-stick-meta":"","astra-migrate-meta-layouts":"default","ast-page-background-enabled":"default","ast-page-background-meta":{"desktop":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"ast-content-background-meta":{"desktop":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"footnotes":""},"categories":[17],"tags":[],"class_list":["post-3677","post","type-post","status-publish","format-standard","hentry","category-development_dev_tools"],"_links":{"self":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/3677","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=3677"}],"version-history":[{"count":0,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/3677\/revisions"}],"wp:attachment":[{"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3677"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3677"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/hasu0707.duckdns.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3677"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}