{"id":37307,"date":"2023-12-10T00:52:45","date_gmt":"2023-01-03T05:39:57","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/"},"modified":"2024-05-04T12:53:05","modified_gmt":"2024-05-04T04:53:05","slug":"git%e9%80%9f%e6%9f%a5%e8%a1%a8-2","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/","title":{"rendered":"Git\u901f\u67e5\u8868."},"content":{"rendered":"

\u6211\u6839\u636e\u4e0b\u9762\u7684\u6587\u7ae0\u8fdb\u884c\u4e86\u7ffb\u8bd1\u3002<\/p>\n

\u83b7\u53d6\u8bb0\u5fc6\u5907\u5fd8\u5355.md<\/p><\/blockquote>\n

\n

\u547d\u4ee4<\/h2>\n

\u5f00\u59cb\u7684\u65b9\u6cd5<\/h3>\n

\u8fdb\u884cGit\u521d\u59cb\u5316<\/p>\n

\u6216\u8005<\/p>\n

\u514b\u9686Git\u4ed3\u5e93\u7684URL<\/p>\n

\u57fa\u672c\u8bbe\u7f6e<\/h3>\n
git config --global<\/span> color.ui true\r\n<\/span>git config --global<\/span> push.default current\r\ngit config --global<\/span> core.editor 'vim -c \"set fenc=utf-8\"'<\/span>\r\ngit config --global<\/span> user.name \"hogehoge\"<\/span>\r\ngit config --global<\/span> user.email hoge@guga.com\r\ngit config --global<\/span> diff.tool meld\r\n<\/code><\/pre>\n
\u5728\u672c\u5730\u5206\u652f\u4e0a\u7684\u5de5\u4f5c<\/h3>\n
\u5206\u652f<\/h4>\n
# \u3059\u3079\u3066\u306e\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u306e\u30ea\u30b9\u30c8\u3092\u898b\u308b\u3002<\/span>\r\ngit branch\r\n\r\n# \u65e2\u5b58\u306e\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u308b\u3002<\/span>\r\ngit checkout branchname\r\n\r\n# \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u65b0\u3057\u3044\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u307e\u3059\u3002\u540d\u524d\u306fnew-branch-name\u306b\u306a\u308a\u307e\u3059\u3002<\/span>\r\ngit checkout -b<\/span> new-branch-name\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u540d\u3092\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u3002<\/span>\r\ngit merge branchname\r\n\r\n# fast-forward\u3092\u884c\u308f\u306a\u3044\u3067\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3059\u308b\u3002\u3053\u308c\u306f\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3067\u884c\u3046\u3082\u306e\u3067\u3059\u3002<\/span>\r\n#\u3000\u30d6\u30e9\u30f3\u30c1\u306b\u4f9d\u5b58\u3059\u308b\u5909\u66f4\u306e\u5c65\u6b74\u3092\u4fdd\u5b58\u3059\u308b\u306e\u306b\u5f79\u7acb\u3061\u307e\u3059\u3002<\/span>\r\n# \u9ad8\u5ea6\u306a\u6a5f\u80fd\u3067\u3059\u304c,\u9055\u3044\u3092\u898b\u308b\u305f\u3081\u306bGUI\u3067\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002<\/span>\r\n# \u901a\u5e38\u306e\u30de\u30fc\u30b8\u3068\u30de\u30fc\u30b8\u306e\u9055\u3044\u3092\u898b\u308b\u306b\u306f--no-ff\u3092\u4ed8\u3051\u307e\u3059\u3002<\/span>\r\ngit merge --no-ff<\/span> branchname\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\u3001\u30d6\u30e9\u30f3\u30c1\u304c\u30de\u30fc\u30b8\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u8b66\u544a\u3092\u3044\u3044\u307e\u3059\u3002<\/span>\r\ngit branch -d<\/span> branchname\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u3092\u5f37\u5236\u7684\u306b\u524a\u9664\u3057\u307e\u3059\u3002\u4f55\u3082\u8b66\u544a\u304c\u3067\u307e\u305b\u3093\u3002 bash\u306erm -rf\u3068\u4f3c\u3066\u3044\u307e\u3059\u3002<\/span>\r\ngit branch -D<\/span> branchname\r\n<\/code><\/pre>\n
\u5206\u652f\u66f4\u65b0<\/h4>\n
\u6807\u51c6<\/p>\n
# \u3059\u3079\u3066\u306e\u30b3\u30df\u30c3\u30c8\u3092\u898b\u308b<\/span>\r\ngit log\r\n\r\n# \u7d20\u6674\u3089\u3057\u3044\u30b3\u30df\u30c3\u30c8\u30d3\u30e5\u30fc\u3067\u3059\uff01\u671b\u3080\u3060\u3051\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/span>\r\n# \u6c17\u306b\u306a\u3063\u305f\u3089\u30b0\u30b0\u30c3\u30c6\u306d :)<\/span>\r\ngit log --pretty<\/span>=<\/span>format:\"%h %s\"<\/span> --graph<\/span>\r\n\r\n# \u904e\u53bb1\u9031\u9593\u306e\u30b3\u30df\u30c3\u30c8\u3092\u898b\u308b\u4e8b\u304c\u3067\u304d\u307e\u3059\u3002<\/span>\r\ngit log --author<\/span>=<\/span>'hoge'<\/span> --after<\/span>={<\/span>1.week.ago}<\/span> --pretty<\/span>=<\/span>oneline --abbrev-commit<\/span>\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u3067\u884c\u308f\u308c\u305f\u5909\u66f4\u306e\u307f\u3092\u8868\u793a\u3059\u308b\uff08\u30d6\u30e9\u30f3\u30c1\u30fb\u30d5\u30a9\u30fc\u30e0\u306e\u30de\u30b9\u30bf\u30fc\u30fb\u30d6\u30e9\u30f3\u30c1\u3067\u3042\u308b\u3068\u4eee\u5b9a\uff09<\/span>\r\ngit log --no-merges<\/span> master..\r\n\r\n# \u73fe\u5728\u306egit\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u614b\u3092\u898b\u308c\u307e\u3059\u3002<\/span>\r\n# \u591a\u304f\u306e\u5834\u5408\u3001\u5b9f\u884c\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u30b3\u30de\u30f3\u30c9\u306b\u95a2\u3059\u308b\u30a2\u30c9\u30d0\u30a4\u30b9\u304c\u3042\u308a\u307e\u3059<\/span>\r\ngit status\r\n\r\n# \u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u77ed\u304f\u307f\u308c\u307e\u3059\u3002\u7269\u4e8b\u3092\u4e00\u76ee\u3067\u898b\u308b\u306e\u306b\u5f79\u7acb\u3064\u3002<\/span>\r\ngit status -s<\/span>\r\n\r\n# \u30b3\u30df\u30c3\u30c8\u3055\u308c\u305f\u5909\u66f4\u6e08\u307f\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3059\u308b\uff08\u5225\u540d\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\uff09<\/span>\r\ngit add filename\r\n\r\n#\u30b3\u30df\u30c3\u30c8\u3055\u308c\u305f\u3059\u3079\u3066\u306e\u5909\u66f4\u6e08\u307f\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3059\u308b\uff08\u5225\u540d\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306e\u3059\u3079\u3066\u306e\u30d5\u30a1\u30a4\u30eb\uff09\u3002<\/span>\r\ngit add .<\/span>\r\n\r\n# \u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u307f\u3092\u8ffd\u52a0\u3059\u308b\u3002<\/span>\r\ngit add '*.txt'<\/span>\r\n\r\n# git\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u8de1\u3057\u306a\u3044\u3088\u3046\u306b\u6307\u793a\u3059\u308b\u3002<\/span>\r\ngit rm <\/span>filename\r\n\r\n# git\u3078\u306e\u5909\u66f4\u3092\u8a18\u9332\u3057\u307e\u3059\u3002\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30a8\u30c7\u30a3\u30bf\u304c\u958b\u304d\u307e\u3059\u3002<\/span>\r\n# (git log \u3067\u8868\u793a)<\/span>\r\n# \u30d5\u30a1\u30a4\u30eb\u304c\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3001\u5c65\u6b74\u3092\u4ed8\u3051\u308b\u4e8b\u304c\u3067\u304d\u307e\u3059\u3002<\/span>\r\ngit commit \r\n\r\n# \u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30df\u30c3\u30c8\u3057\u30011\u3064\u306e\u30b3\u30de\u30f3\u30c9\u3067\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u66f8\u304f\u4e8b\u304c\u3067\u304d\u307e\u3059<\/span>\r\ngit commit -m<\/span> 'Some commit message'<\/span>\r\n\r\n# \u5c65\u6b74\u3092\u5909\u66f4\u3059\u308b:) \u4ee5\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u5909\u66f4\u3057\u305f\u3044\u5834\u5408\u3001<\/span>\r\n# \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u307e\u3060\u30d7\u30c3\u30b7\u30e5\u3057\u3066\u3044\u306a\u3051\u308c\u3070<\/span>\r\n# git add\u3067\u8ffd\u52a0\u3057\u3066\u3001\u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u4e8b\u3067\u65b0\u3057\u3044\u5909\u66f4\u3092\u52a0\u3048\u308b\u4e8b\u304c\u51fa\u6765\u3066<\/span>\r\n# \u904e\u53bb\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4fee\u6b63\u3059\u308b\u4e8b\u304c\u3067\u304d\u307e\u3059\u3002<\/span>\r\ngit commit --amend<\/span>\r\n\r\n<\/code><\/pre>\n
\u5e94\u7528<\/p>\n
# reset \u306f HEAD \u306e\u4f4d\u7f6e\u3092\u5909\u66f4\u3057\u307e\u3059\u3002\u5f93\u3063\u3066reset \u306f\u30b9\u30c6\u30fc\u30b8\u4e0a\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u964d\u308d\u3059\u306e\u3067\u3001add \u306e\u53d6\u308a\u6d88\u3057\u306b\u306a\u308b<\/span>\r\ngit reset\r\n\r\n# reset --hard \u306f\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u3078\u306e\u5909\u66f4\u3082\u524a\u9664\u3057\u3066\u3057\u307e\u3046\u3002\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3044\u306a\u3044\u4f5c\u696d\u306f\u6d88\u3048\u307e\u3059\u3002<\/span>\r\ngit reset --hard<\/span> HEAD\r\n\r\n# \u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u306e\u3001\u3042\u308b\u6642\u70b9\u307e\u3067\u623b\u308b\u3002<\/span>\r\ngit reset tag\r\ngit reset <commit-hash>\r\n\r\n# \u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3053\u3068\u306a\u304f\u73fe\u5728\u306e\u5909\u66f4\u3092\u4fdd\u5b58\u3059\u308b = \u30b9\u30bf\u30c3\u30b7\u30e5\u3002<\/span>\r\ngit stash\r\n\r\n# \u30b9\u30bf\u30c3\u30b7\u30e5\u3092\u9069\u7528\u3057\u3001\u9069\u7528\u3057\u305f\u30b9\u30bf\u30c3\u30b7\u30e5\u3092\u524a\u9664\u3059\u308b<\/span>\r\ngit stash pop\r\n\r\n# \u307e\u3060\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306f\u3001\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u5143\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u623b\u305b\u307e\u3059\u3002<\/span>\r\n# \u305d\u308c\u4ee5\u5916\u306e\u5834\u5408\u306f\u3001git reset filename\u307e\u305f\u306fgit reset --hard filename\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002<\/span>\r\ngit checkout filename \r\n<\/code><\/pre>\n
\u53d8\u66f4\u7684\u6bd4\u8f83<\/p>\n
# \u73fe\u5728\u306e\u5909\u66f4\u306f\u3001\u307e\u3060\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3055\u308c\u3066\u3044\u306a\u3044\u3082\u306e\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/span>\r\n# git add\u3092\u5b9f\u884c\u3059\u308b\u524d\u306b\u30c1\u30a7\u30c3\u30af\u3059\u308b\u4e8b\u3092\u304a\u52e7\u3081\u3057\u307e\u3059\u3002<\/span>\r\ngit diff\r\n\r\n# \u307e\u3060\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u73fe\u5728\u306e\u5909\u66f4\u3092\u78ba\u8a8d\u3059\u308b\u3002 (\u6bb5\u968e\u7684\u306a\u5909\u66f4\u3092\u542b\u3080)<\/span>\r\ngit diff HEAD\r\n\r\n# \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3068\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u6bd4\u8f03\u3059\u308b\u3002<\/span>\r\ngit diff branch-name\r\n\r\n# diff\u3068\u540c\u3058\u3067\u3059\u304c\u3001\u8a2d\u5b9a\u3057\u305fdifftool\u7d4c\u7531\u3067\u5909\u66f4\u3092\u958b\u304d\u307e\u3059\u3002<\/span>\r\n# \u30aa\u30d7\u30b7\u30e7\u30f3-d\u306f\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30e2\u30fc\u30c9\u3067\u958b\u304f\u3088\u3046\u306b\u6307\u793a\u3057\u307e\u3059\u3002<\/span>\r\n# \u5404\u30d5\u30a1\u30a4\u30eb\u306f\u4e00\u5ea6\u306b1\u3064\u305a\u3064\u3067\u3059\u3002<\/span>\r\ngit difftool -d<\/span>\r\n\r\n# \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u884c\u308f\u308c\u305f\u5909\u66f4\u306e\u307f\u3092\u8868\u793a\u3059\u308b (\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u3068\u6bd4\u8f03\u3057\u307e\u3059\u3002)<\/span>\r\n# \u30b9\u30bf\u30f3\u30c9\u30a2\u30ed\u30f3\u30d6\u30e9\u30f3\u30c1\u3067\u3057\u3070\u3089\u304f\u4f5c\u696d\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u5f79\u7acb\u3061\u307e\u3059<\/span>\r\ngit difftool -d<\/span> master..\r\n\r\n# \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u5909\u66f4\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u540d\u306e\u307f\u3092\u8868\u793a\u3059\u308b<\/span>\r\ngit diff --no-commit-id<\/span> --name-only<\/span> --no-merges<\/span> origin\/master...\r\n\r\n# \u4e0a\u8a18\u3068\u540c\u69d8\u3067\u3059\u304c\u3001\u3069\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u305f\u304b\u3001\u3069\u306e\u3088\u3046\u306b\u5909\u66f4\u3055\u308c\u305f\u304b\u3092\u8868\u793a\u3057\u307e\u3059\u3002<\/span>\r\ngit diff --stat<\/span> #\u6bd4\u8f03\u6761\u4ef6<\/span>\r\n<\/code><\/pre>\n
\u901a\u8fc7\u8fdc\u7a0b\u5206\u652f\u8fdb\u884c\u5de5\u4f5c<\/h3>\n
# \u3042\u306a\u305f\u304cgit\u30af\u30ed\u30fc\u30f3\u3092\u3057\u305f\u5834\u5408\u3001\u5229\u7528\u53ef\u80fd\u306a\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30ea\u30b9\u30c8\u3092\u53c2\u7167\u3057\u3066<\/span>\r\n# \u5c11\u306a\u304f\u3068\u30821\u3064\u306e \"origin\"\u3092\u6301\u3063\u3066\u3044\u307e\u3059\u3002<\/span>\r\ngit remote\r\n\r\n# git\u306eURL\u3092\u4f7f\u3063\u3066\u30ea\u30e2\u30fc\u30c8repos\u306e\u8a73\u7d30\u3092\u8868\u793a\u3059\u308b<\/span>\r\ngit remote -v<\/span>\r\n\r\n#\u3000\"origin\"\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u3001\u65b0\u3057\u3044\u30ea\u30e2\u30fc\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002<\/span>\r\ngit remote add origin <https:\/\/some-git-remote-url>\r\n\r\n# \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u30d7\u30c3\u30b7\u30e5\u3059\u308b\uff08\u901a\u5e38\u306f\u540c\u3058\u540d\u524d\uff09<\/span>\r\n# \u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1\u3068\u547c\u3070\u308c\u3066\u3044\u307e\u3059\u3002<\/span>\r\ngit push\r\n\r\n# \u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u304c\u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1\u3068\u3057\u3066\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306f\u3001\u305d\u306e\u3088\u3046\u306b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/span>\r\n# \u30aa\u30d7\u30b7\u30e7\u30f3 -u\u306fGit\u306b\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u8a18\u61b6\u3055\u305b\u308b.<\/span>\r\ngit push -u<\/span> origin master \r\n\r\n#\u305d\u308c\u4ee5\u5916\u306e\u5834\u5408\u306f\u3001\u30ea\u30e2\u30fc\u30c8\u3068\u30d6\u30e9\u30f3\u30c1\u3092\u624b\u52d5\u3067\u6307\u5b9a\u3057\u3066\u6bce\u56de\u4f7f\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059<\/span>\r\ngit push origin branchname\r\n\r\n# \u30d7\u30c3\u30b7\u30e5\u3068\u540c\u3058\u3088\u3046\u306b\u3001\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u6700\u65b0\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u5165\u624b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/span>\r\n# defaul\u306b\u3088\u3063\u3066Git\u306f \"origin\"\u3068\u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u5f15\u304d\u629c\u3053\u3046\u3068\u3057\u307e\u3059\u3002<\/span>\r\ngit pull\r\n\r\n# \u307e\u305f\u306fgit\u306b\u7279\u5b9a\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u5f15\u304d\u51fa\u3059\u3088\u3046\u306b\u6307\u793a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/span>\r\ngit pull origin branchname\r\n\r\n# git pull\u306f\u5b9f\u969b\u306b\u306f2\u3064\u306e\u30b3\u30de\u30f3\u30c9\u306e\u77ed\u304f\u3057\u305f\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<\/span>\r\n# \u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u306e\u5909\u66f4\u3092\u6700\u521d\u306b\u53d6\u5f97\u3059\u308b\u3088\u3046git\u306b\u4f1d\u3048\u308b:fetch<\/span>\r\n# \u305d\u3057\u3066\u3001\u305d\u308c\u3089\u3092\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b:merge<\/span>\r\ngit fetch &&<\/span> git merge origin\/remote-branch-name\r\n\r\n#\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u66f4\u65b0\u3059\u308b\u5834\u5408\u306f\u30aa\u30d7\u30b7\u30e7\u30f3\u306b-p\u3092\u4ed8\u3051\u308b\u4e8b\u3067\u3001\u30d5\u30a7\u30c3\u30c1\u3068\u30d1\u30fc\u30b8\u304c\u3067\u304d\u307e\u3059<\/span>\r\ngit fetch -p<\/span>\r\n\r\n#\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a\u3059\u308b\u306b\u306f<\/span>\r\n# \u30aa\u30d7\u30b7\u30e7\u30f3\u306b-a\u3092\u4ed8\u3051\u308b\u4e8b\u3067\u3059\u3079\u3066\u3092\u8868\u3057\u307e\u3059<\/span>\r\ngit branch -a<\/span> \r\n<\/code><\/pre>\n
\u8d44\u6e90<\/h2>\n
\u8d44\u6599\u53c2\u8003<\/h3>\n
    \n
  • \n
      Try Github – https:\/\/try.github.io<\/ul>\n<\/li>\n<\/ul>\n
      lernGitBranching http:\/\/pcottle.github.io\/learnGitBranching\/?NODEMO<\/p>\n
      Pro Git – Free Book – http:\/\/git-scm.com\/book<\/p>\n
      \u67e5\u770b\u5c65\u5386\u3002<\/h3>\n
        \n
      • \n
          Source Tree – http:\/\/www.sourcetreeapp.com\/<\/ul>\n<\/li>\n<\/ul>\n
          tig – sudo apt-get install tig or brew install tig etc
          \ngitk – sudo apt-get install gitk<\/p>\n
          \u5408\u5e76\/\u5dee\u5f02\u5de5\u5177<\/h3>\n
            \n
          • \n
              Meld – sudo apt-get install meld or brew install meld<\/ul>\n<\/li>\n<\/ul>\n
              Open Diff
              \np4v Merge – http:\/\/git-scm.com\/book\/en\/Customizing-Git-Git-Configuration#External-Merge-and-Diff-Tools<\/p>\n
              Webstorm<\/p>\n","protected":false},"excerpt":{"rendered":"
              \u6211\u6839\u636e\u4e0b\u9762\u7684\u6587\u7ae0\u8fdb\u884c\u4e86\u7ffb\u8bd1\u3002 \u83b7\u53d6\u8bb0\u5fc6\u5907\u5fd8\u5355.md \u547d\u4ee4 \u5f00\u59cb\u7684\u65b9\u6cd5 \u8fdb\u884cGit\u521d\u59cb\u5316 \u6216\u8005 \u514b\u9686Git\u4ed3\u5e93\u7684 […]<\/p>\n","protected":false},"author":8,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37307","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit\u901f\u67e5\u8868. - 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\/git\u901f\u67e5\u8868-2\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u901f\u67e5\u8868.\" \/>\n<meta property=\"og:description\" content=\"\u6211\u6839\u636e\u4e0b\u9762\u7684\u6587\u7ae0\u8fdb\u884c\u4e86\u7ffb\u8bd1\u3002 \u83b7\u53d6\u8bb0\u5fc6\u5907\u5fd8\u5355.md \u547d\u4ee4 \u5f00\u59cb\u7684\u65b9\u6cd5 \u8fdb\u884cGit\u521d\u59cb\u5316 \u6216\u8005 \u514b\u9686Git\u4ed3\u5e93\u7684 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u901f\u67e5\u8868-2\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-01-03T05:39:57+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T04:53:05+00:00\" \/>\n<meta name=\"author\" content=\"\u96c5, \u609f\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u96c5, \u609f\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"2 \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\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/\",\"name\":\"Git\u901f\u67e5\u8868. - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-01-03T05:39:57+00:00\",\"dateModified\":\"2024-05-04T04:53:05+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u901f\u67e5\u8868.\"}]},{\"@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\/f044a4b7fa4ee2701702942002419ca6\",\"name\":\"\u96c5, \u609f\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g\",\"caption\":\"\u96c5, \u609f\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yawu\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u901f\u67e5\u8868. - 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\/git\u901f\u67e5\u8868-2\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u901f\u67e5\u8868.","og_description":"\u6211\u6839\u636e\u4e0b\u9762\u7684\u6587\u7ae0\u8fdb\u884c\u4e86\u7ffb\u8bd1\u3002 \u83b7\u53d6\u8bb0\u5fc6\u5907\u5fd8\u5355.md \u547d\u4ee4 \u5f00\u59cb\u7684\u65b9\u6cd5 \u8fdb\u884cGit\u521d\u59cb\u5316 \u6216\u8005 \u514b\u9686Git\u4ed3\u5e93\u7684 […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u901f\u67e5\u8868-2\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-01-03T05:39:57+00:00","article_modified_time":"2024-05-04T04:53:05+00:00","author":"\u96c5, \u609f","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u96c5, \u609f","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"2 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/","name":"Git\u901f\u67e5\u8868. - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-01-03T05:39:57+00:00","dateModified":"2024-05-04T04:53:05+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u901f\u67e5\u8868."}]},{"@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\/f044a4b7fa4ee2701702942002419ca6","name":"\u96c5, \u609f","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g","caption":"\u96c5, \u609f"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yawu\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-2\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37307","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\/8"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37307"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37307\/revisions"}],"predecessor-version":[{"id":98433,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37307\/revisions\/98433"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37307"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37307"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37307"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}