{"id":494,"date":"2022-10-01T15:59:09","date_gmt":"2022-10-01T06:59:09","guid":{"rendered":"https:\/\/fewmatters.jp\/?p=494"},"modified":"2022-10-01T15:59:09","modified_gmt":"2022-10-01T06:59:09","slug":"git-command-tips","status":"publish","type":"post","link":"https:\/\/fewmatters.jp\/?p=494","title":{"rendered":"git\u30b3\u30de\u30f3\u30c9\u5099\u5fd8\u9332"},"content":{"rendered":"\n

diff \u5468\u308a<\/h2>\n\n\n\n
$ git diff --cached<\/code><\/pre>\n\n\n\n
add\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u3001\u6700\u65b0\u30b3\u30df\u30c3\u30c8\u3068\u306e\u5dee\u5206\u3002<\/p>\n\n\n\n
$ git diff --cached --name-only<\/code><\/pre>\n\n\n\n
add\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3060\u3051\u4e00\u89a7\u3002<\/p>\n\n\n\n
$ git diff --name-only\r<\/code><\/pre>\n\n\n\n
add\u3057\u3066\u306a\u304b\u308d\u3046\u3068\u5dee\u5206\u306e\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u4e00\u89a7\u3002<\/p>\n\n\n\n
add \u5468\u308a<\/h2>\n\n\n\n
$ git add [\u30c7\u30a3\u30ec\u30af\u30c8\u30ea]<\/code><\/pre>\n\n\n\n
\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5168\u90e8\u8ffd\u52a0\u3055\u308c\u308b\u3002\u30b9\u30da\u30fc\u30b9\u3067\u533a\u5207\u308a\u3067\u8907\u6570\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u6307\u5b9a\u3082\u3067\u304d\u308b\u3002<\/p>\n\n\n\n
$ git add -u<\/code><\/pre>\n\n\n\n
\u5909\u66f4\u30fb\u524a\u9664\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u304c\u5bfe\u8c61\u3002\u65b0\u898f\u4f5c\u6210\u30fbgit\u7ba1\u7406\u3057\u3066\u3044\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u306f\u5bfe\u8c61\u5916\u3002update\u306eu\u3002<\/p>\n\n\n\n
$ git add -A\r<\/code><\/pre>\n\n\n\n
\u5909\u66f4\u30fb\u524a\u9664\u30fb\u65b0\u898f\u4f5c\u6210\u306e\u3059\u3079\u3066\u304c\u5bfe\u8c61\u3002A\u306fall\u304b\u3089\u3002<\/p>\n\n\n\n
commit \u5468\u308a<\/h2>\n\n\n\n
$ git commit --amend -m '[\u5909\u66f4\u5f8c\u306e\u30e1\u30c3\u30bb\u30fc\u30b8]'<\/code><\/pre>\n\n\n\n
\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5909\u66f4\u3002<\/p>\n\n\n\n
push \u5468\u308a<\/h2>\n\n\n\n
$ git push -u origin master\r<\/code><\/pre>\n\n\n\n
\u610f\u5473\u3092\u8003\u3048\u308b\u59cb\u3081\u308b\u3068\u610f\u5916\u3068\u3084\u3084\u3053\u3057\u3044\u304c\u3001 http:\/\/dqn.sakusakutto.jp\/2011\/10\/git_push_origin_master.html<\/a> \u304c\u5206\u304b\u308a\u3084\u3059\u3044\u306e\u3067\u53c2\u7167\u3002u\u306f\u4e0a\u6d41\u30d6\u30e9\u30f3\u30c1upstream\u306eu\u3002<\/p>\n\n\n\n
$ git push -u origin [\u30d6\u30e9\u30f3\u30c1\u540d]<\/code><\/pre>\n\n\n\n
\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u305f\u6642\u3002<\/p>\n\n\n\n
\u30d6\u30e9\u30f3\u30c1\u5468\u308a<\/h2>\n\n\n\n
$ git checkout -b [\u30d6\u30e9\u30f3\u30c1\u540d]<\/code><\/pre>\n\n\n\n
\u65b0\u3057\u304f\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3066\u5207\u308a\u66ff\u3048\u308b\u3002<\/p>\n\n\n\n
$ git checkout [\u30d6\u30e9\u30f3\u30c1\u540d]<\/code><\/pre>\n\n\n\n
\u4f5c\u6210\u6e08\u307f\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u308b\u3002<\/p>\n\n\n\n
$ git branch -vv\r<\/code><\/pre>\n\n\n\n
\u30d6\u30e9\u30f3\u30c1\u95a2\u9023\u306e\u60c5\u5831\u3092\u898b\u305f\u3044\u6642\u306f\u5927\u4f53\u3053\u308c\u3067OK\u3002vv\u306f\u8a73\u7d30verbose\u00d72\u306e\u610f\u3089\u3057\u3044\u3002<\/p>\n\n\n\n
stash \u5468\u308a<\/h2>\n\n\n\n
$ git stash save [\u30e1\u30c3\u30bb\u30fc\u30b8]\r<\/code><\/pre>\n\n\n\n
\u5909\u66f4\u306e\u4e00\u6642\u7684\u306a\u9000\u907f\u3002https:\/\/qiita.com\/fukajun\/items\/41288806e4733cb9c342<\/a> \u304c\u5168\u4f53\u7684\u306b\u5206\u304b\u308a\u3084\u3059\u3044\u3002<\/p>\n\n\n\n
$ git stash list<\/code><\/pre>\n\n\n\n
stash\u3055\u308c\u3066\u3044\u308b\u5909\u66f4\u306e\u4e00\u89a7\u3002<\/p>\n\n\n\n
$ git stash apply stash@{0}\r<\/code><\/pre>\n\n\n\n
\u9000\u907f\u3057\u305f\u5909\u66f4\u3092\u53d6\u308a\u51fa\u3059\u30020\u304c\u76f4\u8fd1\u3067\u3001\u6700\u8fd1\u306e\u3082\u306e\u304b\u3089\u82e5\u3044\u756a\u53f7\u306b\u306a\u308b\u3002<\/p>\n\n\n\n
$ git stash drop stash@{0}\r<\/code><\/pre>\n\n\n\n
\u9000\u907f\u3057\u305f\u5909\u66f4\u3092\u6d88\u53bb\u3002<\/p>\n\n\n\n
rebase \u5468\u308a<\/h2>\n\n\n\n
\u82e6\u3057\u3080\u306e\u3067\u4f7f\u3046\u3079\u304d\u3067\u306f\u306a\u3044\u3002merge\u3092\u4f7f\u3044\u307e\u3057\u3087\u3046\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
diff \u5468\u308a add\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u3001\u6700\u65b0\u30b3\u30df\u30c3\u30c8\u3068\u306e\u5dee\u5206\u3002 add\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3060\u3051\u4e00\u89a7\u3002 add\u3057\u3066\u306a\u304b\u308d\u3046\u3068\u5dee\u5206\u306e\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u4e00\u89a7\u3002 add \u5468\u308a \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5168\u90e8\u8ffd\u52a0\u3055\u308c\u308b\u3002\u30b9\u30da […]<\/p>\n","protected":false},"author":1,"featured_media":576,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_uag_custom_page_level_css":"","footnotes":""},"categories":[24],"tags":[],"uagb_featured_image_src":{"full":["https:\/\/fewmatters.jp\/wp-content\/uploads\/2023\/09\/header_2-scaled.jpg",2560,340,false],"thumbnail":["https:\/\/fewmatters.jp\/wp-content\/uploads\/2023\/09\/header_2-150x150.jpg",150,150,true],"medium":["https:\/\/fewmatters.jp\/wp-content\/uploads\/2023\/09\/header_2-600x80.jpg",600,80,true],"medium_large":["https:\/\/fewmatters.jp\/wp-content\/uploads\/2023\/09\/header_2-768x102.jpg",768,102,true],"large":["https:\/\/fewmatters.jp\/wp-content\/uploads\/2023\/09\/header_2-1024x136.jpg",1024,136,true],"1536x1536":["https:\/\/fewmatters.jp\/wp-content\/uploads\/2023\/09\/header_2-1536x204.jpg",1536,204,true],"2048x2048":["https:\/\/fewmatters.jp\/wp-content\/uploads\/2023\/09\/header_2-2048x272.jpg",2048,272,true]},"uagb_author_info":{"display_name":"\u97f3\u7121\u7a7a Sora Otonashi","author_link":"https:\/\/fewmatters.jp\/?author=1"},"uagb_comment_info":0,"uagb_excerpt":"diff \u5468\u308a add\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u3001\u6700\u65b0\u30b3\u30df\u30c3\u30c8\u3068\u306e\u5dee\u5206\u3002 add\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3060\u3051\u4e00\u89a7\u3002 …","_links":{"self":[{"href":"https:\/\/fewmatters.jp\/index.php?rest_route=\/wp\/v2\/posts\/494"}],"collection":[{"href":"https:\/\/fewmatters.jp\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fewmatters.jp\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fewmatters.jp\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fewmatters.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=494"}],"version-history":[{"count":3,"href":"https:\/\/fewmatters.jp\/index.php?rest_route=\/wp\/v2\/posts\/494\/revisions"}],"predecessor-version":[{"id":498,"href":"https:\/\/fewmatters.jp\/index.php?rest_route=\/wp\/v2\/posts\/494\/revisions\/498"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/fewmatters.jp\/index.php?rest_route=\/wp\/v2\/media\/576"}],"wp:attachment":[{"href":"https:\/\/fewmatters.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=494"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fewmatters.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=494"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fewmatters.jp\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=494"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}