{"id":37586,"date":"2023-06-17T04:26:10","date_gmt":"2023-05-21T08:04:11","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/"},"modified":"2024-04-30T09:16:40","modified_gmt":"2024-04-30T01:16:40","slug":"%e4%ba%86%e8%a7%a3git","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/","title":{"rendered":"\u4e86\u89e3Git"},"content":{"rendered":"

\u9996\u5148<\/h1>\n

\u6211\u8bd5\u7740\u628aGit\u521d\u5b66\u8005\u5bf9\u5b9e\u9645\u5de5\u4f5c\u6d41\u7a0b\u7684\u60f3\u8c61\u5199\u4e0b\u6765\u4e86\u3002\u5982\u679c\u6709\u9519\u8bef\u6216\u8bef\u89e3\u4e4b\u5904\uff0c\u8bf7\u60a8\u6307\u6b63\uff0c\u6211\u5c06\u4e0d\u80dc\u611f\u6fc0\uff01<\/p>\n

\u53c2\u8003\u7f51\u7ad9\uff1a
\nhttps:\/\/backlog.com\/ja\/git-tutorial\/
\nhttps:\/\/qiita.com\/nnahito\/items\/565f8755e70c51532459<\/p>\n

\u73af\u5883\uff1agit\u7248\u672c\u4e3a2.20.1\uff08\u82f9\u679cGit-117\uff09\u3002<\/p>\n

2019\/5\/21\u66f4\u65b0<\/h1>\n

\u5c06\u73af\u5883\u53d8\u91cf\u914d\u7f6e\u6587\u4ef6\u6392\u9664\u5728git\u7ba1\u7406\u4e4b\u5916<\/h3>\n

\u7531\u4e8e\u5728.gitignore\u4e2d\u8fdb\u884c\u4e86\u7ba1\u7406\uff0c\u6240\u4ee5\u6839\u636e\u9700\u8981\u8fdb\u884c\u7f16\u8f91\u3002
\n\u672c\u6b21\u4f7f\u7528.env\u6587\u4ef6\u6765\u7ba1\u7406\u73af\u5883\u53d8\u91cf\uff0c\u800c\u5728Laravel\u4e2d\uff0c\u9ed8\u8ba4\u60c5\u51b5\u4e0b.env\u662f\u53d7\u5230\u7ba1\u7406\u7684\uff0c\u6240\u4ee5\u4e0d\u9700\u8981\u989d\u5916\u7684\u5904\u7406\u3002<\/p>\n

\u53c2\u8003\u7f51\u7ad9\uff1a
\nhttp:\/\/www-creators.com\/archives\/1662<\/p>\n

\u5728\u672c\u5730\u4ee3\u7801\u5e93\u4e2d\u521b\u5efa\u6587\u4ef6\u5e76\u63d0\u4ea4<\/h1>\n
# \u30ed\u30fc\u30ab\u30eb\u306e\u4efb\u610f\u306e\u5834\u6240\u306b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210<\/span>\r\n$ <\/span>mkdir <\/span>tutorial\r\n\r\n# \u4f5c\u6210\u3057\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u79fb\u52d5<\/span>\r\n$ <\/span>cd <\/span>tutorial\r\n\r\n# Git\u521d\u671f\u5316<\/span>\r\n$ <\/span>git init\r\nInitialized empty Git repository in<\/span> \/Users\/***<\/span>\/tutorial\/.git\/\r\n\r\n# \u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\uff08\u4efb\u610f\u306e\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\uff09<\/span>\r\n$ <\/span>vim sample.txt\r\n\r\n# \u72b6\u614b\u3092\u78ba\u8a8d<\/span>\r\n$ <\/span>git status\r\nOn branch master\r\nNo commits yet\r\nUntracked files:\r\n  (<\/span>use \"git add <file>...\"<\/span> to include in <\/span>what will be committed)<\/span>\r\n    sample.txt\r\nnothing added to commit but untracked files present (<\/span>use \"git add\"<\/span> to track)<\/span>\r\n\r\n# \u4f5c\u6210\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u767b\u9332\u3059\u308b<\/span>\r\n$ <\/span>git add sample.txt\r\n\r\n# \u72b6\u614b\u3092\u78ba\u8a8d<\/span>\r\n$ <\/span>git status\r\nOn branch master\r\nNo commits yet\r\nChanges to be committed:\r\n  (<\/span>use \"git rm --cached <file>...\"<\/span> to unstage)<\/span>\r\n    new file:   sample.txt\r\n\r\n# commit\u3059\u308b<\/span>\r\n$ <\/span>git commit -m<\/span> \"first commit\"<\/span>\r\n[<\/span>master (<\/span>root-commit)<\/span> 0b0d8ff] first commit\r\n 1 file changed, 1 insertion(<\/span>+)<\/span>\r\n create mode 100644 sample.txt\r\n\r\n# \u72b6\u614b\u3092\u78ba\u8a8d<\/span>\r\n$ <\/span>git status\r\nOn branch master\r\nnothing to commit, working tree clean\r\n\r\n# \u30ed\u30b0\u3092\u78ba\u8a8d<\/span>\r\n$ <\/span>git log\r\ncommit 0b0d8ff22e1e5f70434a591fc7ed8603ba486408 (<\/span>HEAD -> master)<\/span>\r\nAuthor: ryoko-i8713 <49637061+ryoko-i8713@users.noreply.github.com>\r\nDate:   Wed May 15 11:03:08 2019 +0900\r\n    first commit\r\n<\/code><\/pre>\n
\u521b\u5efa\u8fdc\u7a0b\u4ed3\u5e93\u5230\u63a8\u9001\u5b8c\u6210<\/h1>\n
\u521b\u5efa\u8fdc\u7a0b\u4ed3\u5e93<\/h2>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u5c06\u6240\u521b\u5efa\u7684\u8fdc\u7a0b\u4ee3\u7801\u5e93\u7684\u540d\u79f0\u8fdb\u884c\u767b\u8bb0<\/h2>\n
\u521b\u5efa\u8fdc\u7a0b\u5b58\u50a8\u5e93\u4f1a\u751f\u6210\u4e00\u4e2aURL\u3002
\n\u4e3a\u4e86\u907f\u514d\u6bcf\u6b21\u63a8\u9001\u672c\u5730\u5b58\u50a8\u5e93\u65f6\u90fd\u9700\u8981\u6307\u5b9aURL\uff0c\u53ef\u4ee5\u4e8b\u5148\u6ce8\u518c\u4e00\u4e2a\u540d\u79f0\u3002<\/p>\n
\r\n$ <\/span>git remote add [<\/span>\u540d\u524d] [<\/span>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u4f5c\u6210\u6642\u306b\u767a\u884c\u3055\u308c\u305fURL]\r\n\r\n# origin\u3068\u3044\u3046\u540d\u524d\u3067\u767b\u9332<\/span>\r\n$ <\/span>git remote add origin https:\/\/github.com\/***<\/span>\/tutorial.git\r\n<\/code><\/pre>\n
\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u63a8\u9001<\/h2>\n
\u56e0\u4e3a\u8fd9\u6b21\u662f\u7b2c\u4e00\u6b21\u5c06\u5728\u672c\u5730\u4ed3\u5e93\u521b\u5efa\u7684\u6587\u4ef6\u63a8\u9001\uff0c\u6240\u4ee5\u5206\u652f\u5c06\u662f\u4e3b\u5206\u652f(master)\u3002<\/p>\n
$ <\/span>git push [<\/span>\u9001\u4fe1\u5148\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u540d] [<\/span>\u30d6\u30e9\u30f3\u30c1\u540d]\r\n\r\n# \u524d\u9805\u3067\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3092origin\u3067\u767b\u9332\u3057\u3066\u3044\u308b\u306e\u3067\u3001\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3092origin\u306bmaster\u3068\u3057\u3066push\u3059\u308b\u3002<\/span>\r\n$ <\/span>git push origin master\r\nEnumerating objects: 3, done<\/span>.<\/span>\r\nCounting objects: 100% (<\/span>3\/3)<\/span>, done<\/span>.<\/span>\r\nWriting objects: 100% (<\/span>3\/3)<\/span>, 264 bytes | 264.00 KiB\/s, done<\/span>.<\/span>\r\nTotal 3 (<\/span>delta 0)<\/span>, reused 0 (<\/span>delta 0)<\/span>\r\nTo \/Users\/ryoko\/tutorial-shared\r\n *<\/span> [<\/span>new branch]      master -> master\r\n<\/code><\/pre>\n
\u5c1d\u8bd5\u4f5c\u4e3a\u53e6\u4e00\u4e2a\u7528\u6237\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u8fdb\u884c\u514b\u9686<\/h1>\n
\u5982\u679c\u60a8\u60f3\u8981\u4e00\u6b21\u6027\u4e0b\u8f7d\u6574\u4e2a\u9879\u76ee\uff0c\u8bf7\u4f7f\u7528\u514b\u9686\uff08clone\uff09\u547d\u4ee4\u3002
\n\u62c9\u53d6\uff08pull\uff09\u547d\u4ee4\u53ea\u4e0b\u8f7d\u8fdc\u7a0b\u5e93\u548c\u672c\u5730\u5e93\u4e4b\u95f4\u7684\u5dee\u5f02\u90e8\u5206\u3002<\/p>\n
\u6211\u4f1a\u4ee5\u7b2c\u4e09\u4eba\u79f0\u7684\u8eab\u4efd\u5c1d\u8bd5\u514b\u9686\u521a\u521a\u63a8\u9001\u7684\u6559\u7a0b\u3002<\/p>\n
$ <\/span>git clone [<\/span>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30eaURL] [<\/span>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d]\r\n\r\n# \u7b2c\u4e09\u8005\u7528\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u300ctutorial2\u300d\u306b\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u8907\u88fd\u3059\u308b<\/span>\r\n$ <\/span>git clone https:\/\/github.com\/ryoko-i8713\/tutorial.git tutorial2\r\nCloning into 'tutorial2'<\/span>...\r\nremote: Enumerating objects: 6, done<\/span>.<\/span>\r\nremote: Counting objects: 100% (<\/span>6\/6)<\/span>, done<\/span>.<\/span>\r\nremote: Compressing objects: 100% (<\/span>2\/2)<\/span>, done<\/span>.<\/span>\r\nUnpacking objects: 100% (<\/span>6\/6)<\/span>, done<\/span>.<\/span>\r\nremote: Total 6 (<\/span>delta 1)<\/span>, reused 6 (<\/span>delta 1)<\/span>, pack-reused 0\r\n\r\n# \u4e2d\u8eab\u3092\u78ba\u8a8d<\/span>\r\n$ <\/span>cd <\/span>tutorial2\r\n$ <\/span>ls<\/span> -a<\/span>\r\n.<\/span>       ..      .git        sample.txt  sample2.txt\r\n<\/code><\/pre>\n
\u514b\u9686\u5b58\u50a8\u5e93\u301c\u8fdb\u884c\u66f4\u6539\u301c\u63a8\u9001<\/h1>\n
\r\n# tutorial2\u306esample.txt\u3092\u7de8\u96c6\u3059\u308b<\/span>\r\n$ <\/span>vim sample.txt\r\n\r\n# \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u767b\u9332\u3059\u308b<\/span>\r\n$ <\/span>git add sample.txt\r\n\r\n# \u72b6\u614b\u3092\u78ba\u8a8d<\/span>\r\n$ <\/span>git status\r\nOn branch master\r\nYour branch is up to date <\/span>with 'origin\/master'<\/span>.<\/span>\r\nChanges to be committed:\r\n  (<\/span>use \"git reset HEAD <file>...\"<\/span> to unstage)<\/span>\r\n    modified:   sample.txt\r\n\r\n# commit<\/span>\r\n$ <\/span>git commit -m<\/span> \"add\u306e\u8aac\u660e\u3092\u8ffd\u52a0\"<\/span>\r\n[<\/span>master e78c86b] add\u306e\u8aac\u660e\u3092\u8ffd\u52a0\r\n 1 file changed, 1 insertion(<\/span>+)<\/span>\r\n\r\n# \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u3092\u5fd8\u308c\u305f\u306e\u3067\u78ba\u8a8d\u3057\u3066\u304a\u304f<\/span>\r\n$ <\/span>git remote -v<\/span>\r\norigin  https:\/\/github.com\/ryoko-i8713\/tutorial.git (<\/span>fetch)<\/span>\r\norigin  https:\/\/github.com\/ryoko-i8713\/tutorial.git (<\/span>push)<\/span>\r\n\r\n# push\u3057\u3066\u30c7\u30fc\u30bf\u3092\u9001\u4fe1\uff08\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u540d\u306f\u65e2\u306borigin\u3068\u3057\u3066\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u306e\u3067git remote add\u306f\u5fc5\u8981\u306a\u3044\uff09<\/span>\r\n$ <\/span>git push origin master\r\nEnumerating objects: 5, done<\/span>.<\/span>\r\nCounting objects: 100% (<\/span>5\/5)<\/span>, done<\/span>.<\/span>\r\nDelta compression using up to 4 threads\r\nCompressing objects: 100% (<\/span>3\/3)<\/span>, done<\/span>.<\/span>\r\nWriting objects: 100% (<\/span>3\/3)<\/span>, 401 bytes | 401.00 KiB\/s, done<\/span>.<\/span>\r\nTotal 3 (<\/span>delta 0)<\/span>, reused 0 (<\/span>delta 0)<\/span>\r\nTo https:\/\/github.com\/ryoko-i8713\/tutorial.git\r\n   5d305d0..e78c86b  master -> master\r\n<\/code><\/pre>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u56de\u5230\u539f\u672c\u7684\u81ea\u5df1\uff0c\u4ece\u8fdc\u7a0b\u5b58\u50a8\u5e93\u62c9\u53d6\u3002<\/h1>\n
\u7531\u4e8e\u7b2c\u4e09\u65b9\u8fdb\u884c\u4e86\u66f4\u6539\uff0c\u5bfc\u81f4\u672c\u5730\u5b58\u50a8\u5e93\u548c\u8fdc\u7a0b\u5b58\u50a8\u5e93\u4ea7\u751f\u4e86\u5dee\u5f02\uff0c\u56e0\u6b64\u4ece\u8fdc\u7a0b\u5b58\u50a8\u5e93\u62c9\u53d6\u66f4\u65b0\u3002<\/p>\n
$ <\/span>git pull [<\/span>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u540d] [<\/span>\u30d6\u30e9\u30f3\u30c1\u540d]\r\n\r\n# \u81ea\u5206\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30eatutorial\u3067pull<\/span>\r\n$ <\/span>git pull origin2 master\r\nremote: Enumerating objects: 5, done<\/span>.<\/span>\r\nremote: Counting objects: 100% (<\/span>5\/5)<\/span>, done<\/span>.<\/span>\r\nremote: Compressing objects: 100% (<\/span>3\/3)<\/span>, done<\/span>.<\/span>\r\nremote: Total 3 (<\/span>delta 0)<\/span>, reused 3 (<\/span>delta 0)<\/span>, pack-reused 0\r\nUnpacking objects: 100% (<\/span>3\/3)<\/span>, done<\/span>.<\/span>\r\nFrom https:\/\/github.com\/ryoko-i8713\/tutorial\r\n *<\/span> branch            master     -> FETCH_HEAD\r\n   5d305d0..e78c86b  master     -> origin2\/master\r\nUpdating 5d305d0..e78c86b\r\nFast-forward\r\n sample.txt | 1 +\r\n 1 file changed, 1 insertion(<\/span>+)<\/span>\r\n\r\n# \u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u307f\u308b<\/span>\r\n$ <\/span>git log\r\ncommit e78c86bfedbfaa96017e95f9da9aa43059c3d5d9 (<\/span>HEAD -> master, origin2\/master)<\/span>\r\nAuthor: ryoko-i8713 <49637061+ryoko-i8713@users.noreply.github.com>\r\nDate:   Wed May 15 14:20:47 2019 +0900\r\n\r\n    add\u306e\u8aac\u660e\u3092\u8ffd\u52a0\r\n\r\ncommit 5d305d011d87ee809e5ce58ad9042303a630a407\r\nAuthor: ryoko-i8713 <49637061+ryoko-i8713@users.noreply.github.com>\r\nDate:   Wed May 15 12:58:31 2019 +0900\r\n\r\n    first commit no,2\r\n\r\ncommit 0b0d8ff22e1e5f70434a591fc7ed8603ba486408 (<\/span>origin\/master)<\/span>\r\nAuthor: ryoko-i8713 <49637061+ryoko-i8713@users.noreply.github.com>\r\nDate:   Wed May 15 11:03:08 2019 +0900\r\n\r\n    first commit\r\n\r\n# \u30d5\u30a1\u30a4\u30eb\u3092\u958b\u3044\u3066\u78ba\u8a8d<\/span>\r\n$ <\/span>less sample.txt\r\n<\/code><\/pre>\n
\u5982\u679c\u4e00\u4e2a\u7b2c\u4e09\u65b9\u5728\u6211\u63a8\u9001\u4e4b\u540e\u8fdb\u884c\u4e86\u63a8\u9001\uff0c\u8fdc\u7a0b\u4ed3\u5e93\u4f1a\u88ab\u66f4\u65b0\u3002<\/h2>\n
\u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u5373\u4f7f\u81ea\u5df1\u5c1d\u8bd5\u63a8\u9001\uff0c\u4e5f\u4f1a\u88ab\u62d2\u7edd=\u6709\u51b2\u7a81\u3002
\n\u6b64\u65f6\u9700\u8981\u8fdb\u884c\u5408\u5e76\u64cd\u4f5c\u3002
\n\u57fa\u672c\u4e0a\uff0c\u5408\u5e76\u64cd\u4f5c\u4f1a\u81ea\u52a8\u8fdb\u884c\u96c6\u6210\uff0c\u4f46\u5982\u679c\u540c\u4e00\u90e8\u5206\u6709\u66f4\u6539\uff0c\u5219\u9700\u8981\u624b\u52a8\u4fee\u590d\u3002<\/p>\n
\r\n# tutorial\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067push\u3059\u308b<\/span>\r\n$ <\/span>git push origin2 master\r\nTo https:\/\/github.com\/ryoko-i8713\/tutorial.git\r\n !<\/span> [<\/span>rejected]        master -> master (<\/span>fetch first)<\/span>\r\nerror: failed to push some refs to 'https:\/\/github.com\/ryoko-i8713\/tutorial.git'<\/span>\r\nhint: Updates were rejected because the remote contains work that you do\r\n<\/span>hint: not have locally. This is usually caused by another repository pushing\r\nhint: to the same ref. You may want to first integrate the remote changes\r\nhint: (<\/span>e.g., 'git pull ...'<\/span>)<\/span> before pushing again.\r\nhint: See the 'Note about fast-forwards'<\/span> in<\/span> 'git push --help'<\/span> for <\/span>details.\r\n\r\n# tutorial\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067pull\u3057\u3066\u307f\u308b<\/span>\r\n$ <\/span>git pull origin2 master\r\nremote: Enumerating objects: 5, done<\/span>.<\/span>\r\nremote: Counting objects: 100% (<\/span>5\/5)<\/span>, done<\/span>.<\/span>\r\nremote: Compressing objects: 100% (<\/span>3\/3)<\/span>, done<\/span>.<\/span>\r\nremote: Total 3 (<\/span>delta 0)<\/span>, reused 3 (<\/span>delta 0)<\/span>, pack-reused 0\r\nUnpacking objects: 100% (<\/span>3\/3)<\/span>, done<\/span>.<\/span>\r\nFrom https:\/\/github.com\/ryoko-i8713\/tutorial\r\n *<\/span> branch            master     -> FETCH_HEAD\r\n   e78c86b..9440d34  master     -> origin2\/master\r\nAuto-merging sample.txt\r\nCONFLICT (<\/span>content)<\/span>: Merge conflict in <\/span>sample.txt\r\nAutomatic merge failed;<\/span> fix conflicts and then <\/span>commit the result.\r\n\r\n# tutorial\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306esample.txt\u3092\u958b\u304d\u3001<<<<<<<\u3068>>>>>>>\u3067\u56f2\u307e\u308c\u305f\u7bc4\u56f2\u304c\u7af6\u5408\u3057\u305f\u7b87\u6240\u306a\u306e\u3067\u3001\u4fee\u6b63\u3059\u308b\u3002<\/span>\r\n$ <\/span>vim sample.txt\r\n\r\n# \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u767b\u9332\u301ccommit\u3059\u308b<\/span>\r\n$ <\/span>git add sample.txt\r\n$ <\/span>git commit -m<\/span> \"\u30de\u30fc\u30b8\"<\/span>\r\n\r\n# \u30ed\u30b0\u3067\u78ba\u8a8d<\/span>\r\n$ <\/span>git log --graph<\/span> --oneline<\/span>\r\n*<\/span>   6564673 (<\/span>HEAD -> master)<\/span> \u30de\u30fc\u30b8\r\n|\\ <\/span> \r\n| *<\/span> 9440d34 (<\/span>origin2\/master)<\/span> pull\u306e\u8aac\u660e\u3092\u8ffd\u52a0\r\n*<\/span> | 21a1654 commit\u306e\u8aac\u660e\u3092\u8ffd\u52a0\r\n|\/  \r\n*<\/span> e78c86b add\u306e\u8aac\u660e\u3092\u8ffd\u52a0\r\n*<\/span> 5d305d0 first commit no,2\r\n*<\/span> 0b0d8ff (<\/span>origin\/master)<\/span> first commit\r\n\r\n# \u518d\u5ea6push\u3057\u3066\u307f\u308b<\/span>\r\n$ <\/span>git push origin2 master\r\n<\/code><\/pre>\n
\u5206\u652f<\/h1>\n
\u4ece\u5927\u5143\uff08master\uff09\u4e2d\u590d\u5236\uff08\u521b\u5efa\u5206\u652f\uff09\uff0c\u5728\u521b\u5efa\u7684\u5de5\u4f5c\u5206\u652f\u4e0a\u8fdb\u884c\u529f\u80fd\u6dfb\u52a0\u548c\u9519\u8bef\u4fee\u590d\u3002<\/p>\n
\r\n# \u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u6210<\/span>\r\n$ <\/span>git branch test <\/span>branch\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u4e00\u89a7\uff08*\u304c\u3064\u3044\u3066\u3044\u308b\u3082\u306e\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\uff09<\/span>\r\n$ <\/span>git branch\r\n*<\/span> master\r\n  testbranch\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u3048<\/span>\r\n$ <\/span>git checkout [<\/span>\u5207\u308a\u66ff\u3048\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u540d]\r\n$ <\/span>git checkout testbranch\r\nSwitched to branch 'testbranch'<\/span>\r\n\r\n# \u9078\u629e\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u304c\u5909\u66f4\u3055\u308c\u305f<\/span>\r\n$ <\/span>git branch\r\n  master\r\n*<\/span> testbranch\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u306e\u4f5c\u6210\u3068\u5207\u308a\u66ff\u3048\u3092\u540c\u6642\u306b<\/span>\r\n$ <\/span>git checkout -b<\/span> \r\n\r\n# sample.txt\u3092\u7de8\u96c6\u3059\u308b<\/span>\r\n$ <\/span>vim sample.txt\r\n\r\n\u30b5\u30eb\u3067\u3082\u308f\u304b\u308bGit\u30b3\u30de\u30f3\u30c9\r\nadd \u5909\u66f4\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u767b\u9332\u3059\u308b\r\ncommit \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u72b6\u614b\u3092\u8a18\u9332\u3059\u308b\r\npull \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5185\u5bb9\u3092\u53d6\u5f97\u3059\u308b\r\ntest <\/span>\u30d6\u30e9\u30f3\u30c1\u3000\u30c6\u30b9\u30c8\uff01\r\n\r\n# \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u767b\u9332<\/span>\r\n$ <\/span>git add sample.txt\r\n\r\n# commit<\/span>\r\n$ <\/span>git commit -m<\/span> \"\u30d6\u30e9\u30f3\u30c1\u30c6\u30b9\u30c8\u3092\u8ffd\u52a0\"<\/span>\r\n[<\/span>testbranch 2ad2455] \u30d6\u30e9\u30f3\u30c1\u30c6\u30b9\u30c8\u3092\u8ffd\u52a0\r\n 1 file changed, 1 insertion(<\/span>+)<\/span>\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u3092testbranch\u3067\u6307\u5b9a\u3057\u3066push<\/span>\r\n$ <\/span>git push origin2 testbranch\r\nEnumerating objects: 5, done<\/span>.<\/span>\r\nCounting objects: 100% (<\/span>5\/5)<\/span>, done<\/span>.<\/span>\r\nDelta compression using up to 4 threads\r\nCompressing objects: 100% (<\/span>3\/3)<\/span>, done<\/span>.<\/span>\r\nWriting objects: 100% (<\/span>3\/3)<\/span>, 386 bytes | 386.00 KiB\/s, done<\/span>.<\/span>\r\nTotal 3 (<\/span>delta 1)<\/span>, reused 0 (<\/span>delta 0)<\/span>\r\nremote: Resolving deltas: 100% (<\/span>1\/1)<\/span>, completed with 1 local <\/span>object.\r\nremote: \r\nremote: Create a pull request for<\/span> 'testbranch'<\/span> on GitHub by visiting:\r\nremote:      https:\/\/github.com\/ryoko-i8713\/tutorial\/pull\/new\/testbranch\r\nremote: \r\nTo https:\/\/github.com\/ryoko-i8713\/tutorial.git\r\n *<\/span> [<\/span>new branch]      testbranch -> testbranch\r\n<\/code><\/pre>\n
\u786e\u8ba4\u8fdc\u7a0b\u5b58\u50a8\u5e93<\/h4>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u5c06\u521b\u5efa\u7684\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5206\u652fmaster<\/h4>\n
\r\n# \u30d6\u30e9\u30f3\u30c1\u3092\u7d50\u5408\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u308b<\/span>\r\n$ <\/span>git checkout master\r\nSwitched to branch 'master'<\/span>\r\n\r\n# \u78ba\u8a8d<\/span>\r\n$ <\/span>git branch\r\n*<\/span> master\r\n  testbranch\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u3092\u7d50\u5408\u3059\u308b<\/span>\r\n$ <\/span>git merge [<\/span>\u7d50\u5408\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u540d]\r\n$ <\/span>git merge testbranch\r\nUpdating 6564673..2ad2455\r\nFast-forward\r\n sample.txt | 1 +\r\n 1 file changed, 1 insertion(<\/span>+)<\/span>\r\n\r\n# \u7d50\u5408\u3057\u305fmaster\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306bpush\u3059\u308b<\/span>\r\n$ <\/span>git push origin2 master\r\nTotal 0 (<\/span>delta 0)<\/span>, reused 0 (<\/span>delta 0)<\/span>\r\nTo https:\/\/github.com\/ryoko-i8713\/tutorial.git\r\n   6564673..2ad2455  master -> master\r\n<\/code><\/pre>\n
\u786e\u8ba4\u8fdc\u7a0b\u4ee3\u7801\u5e93<\/h4>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u5220\u9664\u5206\u652f<\/h4>\n
\u5220\u9664\u5df2\u5b8c\u6210\u96c6\u6210\u7684\u5206\u652f<\/p>\n
$ <\/span>git branch -d<\/span> [<\/span>\u30d6\u30e9\u30f3\u30c1\u540d]\r\n\r\n# testbranch\u3092\u524a\u9664\u3059\u308b<\/span>\r\n$ <\/span>git branch -d<\/span> testbranch\r\nDeleted branch testbranch (<\/span>was 2ad2455)<\/span>.<\/span>\r\n\r\n# \u78ba\u8a8d<\/span>\r\n$ <\/span>git branch\r\n*<\/span> master\r\n<\/code><\/pre>\n
\u6709\u5173\u5206\u652f\u673a\u6784\u7684\u8fd0\u8425\u65b9\u5f0f<\/h1>\n
\u6211\u5df2\u7ecf\u5b66\u4f1a\u4e86Git\u7684\u57fa\u672c\u64cd\u4f5c\uff0c\u4f46\u5728\u4f55\u65f6\u521b\u5efa\u5206\u652f\u7684\u65f6\u673a\u65b9\u9762\u611f\u5230\u56f0\u60d1\uff0c\u770b\u5230\u4e86\u8fd9\u7bc7\u6587\u7ae0\u540e\u771f\u6b63\u7406\u89e3\u4e86\uff0c\u56e0\u6b64\u6211\u53c2\u8003\u4e86\u5b83\u3002<\/p>\n
\u6709\u5173Git\u5206\u652f\u6a21\u578b\u7684\u4fe1\u606f\uff0c\u8bf7\u53c2\u8003https:\/\/qiita.com\/okuderap\/items\/0b57830d2f56d1d51692<\/p>\n","protected":false},"excerpt":{"rendered":"
\u9996\u5148 \u6211\u8bd5\u7740\u628aGit\u521d\u5b66\u8005\u5bf9\u5b9e\u9645\u5de5\u4f5c\u6d41\u7a0b\u7684\u60f3\u8c61\u5199\u4e0b\u6765\u4e86\u3002\u5982\u679c\u6709\u9519\u8bef\u6216\u8bef\u89e3\u4e4b\u5904\uff0c\u8bf7\u60a8\u6307\u6b63\uff0c\u6211\u5c06\u4e0d\u80dc\u611f\u6fc0\uff01 \u53c2\u8003\u7f51 […]<\/p>\n","protected":false},"author":11,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37586","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u4e86\u89e3Git - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/\u4e86\u89e3git\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u4e86\u89e3Git\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u6211\u8bd5\u7740\u628aGit\u521d\u5b66\u8005\u5bf9\u5b9e\u9645\u5de5\u4f5c\u6d41\u7a0b\u7684\u60f3\u8c61\u5199\u4e0b\u6765\u4e86\u3002\u5982\u679c\u6709\u9519\u8bef\u6216\u8bef\u89e3\u4e4b\u5904\uff0c\u8bf7\u60a8\u6307\u6b63\uff0c\u6211\u5c06\u4e0d\u80dc\u611f\u6fc0\uff01 \u53c2\u8003\u7f51 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u4e86\u89e3git\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-05-21T08:04:11+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T01:16:40+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2f3337434c4406c572e7\/12-0.png\" \/>\n<meta name=\"author\" content=\"\u65b0, \u97f5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u65b0, \u97f5\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"5 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/\",\"name\":\"\u4e86\u89e3Git - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-05-21T08:04:11+00:00\",\"dateModified\":\"2024-04-30T01:16:40+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u4e86\u89e3Git\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\",\"name\":\"\u65b0, \u97f5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"caption\":\"\u65b0, \u97f5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u4e86\u89e3Git - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/\u4e86\u89e3git\/","og_locale":"zh_CN","og_type":"article","og_title":"\u4e86\u89e3Git","og_description":"\u9996\u5148 \u6211\u8bd5\u7740\u628aGit\u521d\u5b66\u8005\u5bf9\u5b9e\u9645\u5de5\u4f5c\u6d41\u7a0b\u7684\u60f3\u8c61\u5199\u4e0b\u6765\u4e86\u3002\u5982\u679c\u6709\u9519\u8bef\u6216\u8bef\u89e3\u4e4b\u5904\uff0c\u8bf7\u60a8\u6307\u6b63\uff0c\u6211\u5c06\u4e0d\u80dc\u611f\u6fc0\uff01 \u53c2\u8003\u7f51 […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u4e86\u89e3git\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-05-21T08:04:11+00:00","article_modified_time":"2024-04-30T01:16:40+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2f3337434c4406c572e7\/12-0.png"}],"author":"\u65b0, \u97f5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u65b0, \u97f5","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"5 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/","name":"\u4e86\u89e3Git - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-05-21T08:04:11+00:00","dateModified":"2024-04-30T01:16:40+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u4e86\u89e3Git"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9","name":"\u65b0, \u97f5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","caption":"\u65b0, \u97f5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%ba%86%e8%a7%a3git\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37586","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/11"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37586"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37586\/revisions"}],"predecessor-version":[{"id":91032,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37586\/revisions\/91032"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37586"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37586"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37586"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}