{"id":37366,"date":"2023-01-05T06:51:16","date_gmt":"2023-08-19T16:50:06","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/"},"modified":"2024-04-29T08:36:04","modified_gmt":"2024-04-29T00:36:04","slug":"%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/","title":{"rendered":"\u3010Git\u3011\u5173\u4e8e.gitconfig"},"content":{"rendered":"

.gitconfig\u7684\u5185\u5bb9<\/h2>\n
[alias]<\/span>\r\n  st<\/span> =<\/span> status<\/span>\r\n  df<\/span> =<\/span> diff<\/span>\r\n  co<\/span> =<\/span> commit<\/span>\r\n  br<\/span> =<\/span> branch<\/span>\r\n  ps<\/span> =<\/span> push<\/span>\r\n  pl<\/span> =<\/span> pull<\/span>\r\n  ck<\/span> =<\/span> checkout<\/span>\r\n  graph<\/span> =<\/span> log --pretty=format:'%Cgreen[%cd] %Cblue%h %Cred<%cn> %Creset%s' --date=short  --decorate --graph --branches --tags --remotes<\/span>\r\n  diffw<\/span> =<\/span> diff --word-diff<\/span>\r\n\r\n[core]<\/span>\r\n  quotepath<\/span>  =<\/span> false<\/span>\r\n  ignorecase<\/span> =<\/span> false<\/span>\r\n  editor<\/span> =<\/span> code --wait --new-window<\/span>\r\n\r\n[diff]<\/span>\r\n  tool<\/span> =<\/span> vscode<\/span>\r\n[difftool \"vscode\"]<\/span>\r\n  cmd<\/span> =<\/span> code --wait --new-window --diff $LOCAL $REMOTE<\/span>\r\n\r\n[user]<\/span>\r\n  email<\/span> =<\/span> example@email.jp<\/span>\r\n  name<\/span> =<\/span> UserName<\/span>\r\n\r\n[init]<\/span>\r\n  defaultBranch<\/span> =<\/span> main<\/span>\r\n\r\n[merge]<\/span>\r\n  tool<\/span> =<\/span> vscode<\/span>\r\n[mergetool \"vscode\"]<\/span>\r\n  cmd<\/span> =<\/span> code --wait --new-window $MERGED<\/span>\r\n\r\n[pull]<\/span>\r\n  ff<\/span> =<\/span> only <\/span>\r\n\r\n[push]<\/span>\r\n  default<\/span> =<\/span> current<\/span>\r\n\r\n<\/code><\/pre>\n
\u5173\u4e8e\u5404\u4e2a\u8bbe\u5b9a<\/h2>\n
\u5316\u540d<\/h3>\n
\u5728\u7ec8\u7aef\u6267\u884c\u547d\u4ee4\u4ee5\u8bbe\u7f6e\u547d\u4ee4\u522b\u540d\u3002\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a<\/p>\n
$ git config --global alias.st status\r\n<\/code><\/pre>\n
\u6838\u5fc3<\/h3>\n
\u6807\u5f15\u8def\u5f84<\/h4>\n
\u60a8\u53ef\u4ee5\u8bbe\u7f6e\u662f\u5426\u5bf9\u65e5\u8bed\u6587\u4ef6\u540d\u8fdb\u884c\u7f16\u7801\u3002
\n\u5982\u679c\u8bbe\u7f6e\u4e3afalse\uff0c\u5219\u4f1a\u4ee5\u6b63\u5e38\u65b9\u5f0f\u663e\u793a\u65e5\u8bed\u6587\u4ef6\u540d\u3002<\/p>\n
$ git status\r\nChanges not staged for commit:\r\n    modified:   \u30b5\u30f3\u30d7\u30eb.md\r\n<\/code><\/pre>\n
\u5ffd\u7565\u5927\u5c0f\u5199<\/h4>\n
\u60a8\u53ef\u4ee5\u8bbe\u7f6e\u6587\u4ef6\u540d\u662f\u5426\u533a\u5206\u5927\u5c0f\u5199\u3002
\n\u9ed8\u8ba4\u60c5\u51b5\u4e0b\u4e0d\u533a\u5206\u5927\u5c0f\u5199\u3002
\n\u5c06\u5176\u8bbe\u7f6e\u4e3afalse\u53ef\u4ee5\u533a\u5206\u5927\u5c0f\u5199\u3002<\/p>\n
\u7f16\u8f91<\/h4>\n
\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u8bbe\u7f6e\u5c06\u7f16\u8f91\u5668\u66f4\u6539\u4e3aVScode\uff0c\u4ee5\u4fbf\u5728\u63d0\u4ea4\u6216\u5408\u5e76\u7b49\u64cd\u4f5c\u65f6\u4f7f\u7528\u3002<\/p>\n
[core]<\/span>\r\n    editor<\/span> =<\/span> code --wait<\/span>\r\n[diff]<\/span>\r\n    tool<\/span> =<\/span> vscode<\/span>\r\n[difftool \"vscode\"]<\/span>\r\n    cmd<\/span> =<\/span> code --wait --diff $LOCAL $REMOTE<\/span>\r\n[merge]<\/span>\r\n    tool<\/span> =<\/span> vscode<\/span>\r\n[mergetool \"vscode\"]<\/span>\r\n    cmd<\/span> =<\/span> code --wait $MERGED<\/span>\r\n<\/code><\/pre>\n
\u4e0d\u540c<\/h3>\n
\u7f16\u8f91\u6839\u636e<\/p>\n
\u7528\u6237<\/h3>\n
\u5728git log\u6216\u5176\u4ed6\u663e\u793a\u7528\u6237\u540d\u548c\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u7684\u5730\u65b9\u8fdb\u884c\u8bbe\u7f6e\u3002<\/p>\n
\u521d\u59cb\u5316\u9ed8\u8ba4\u5206\u652f<\/h3>\n
\u8bbe\u7f6e\u9ed8\u8ba4\u5206\u652f\u540d\u79f0\u3002<\/p>\n
\u5408\u5e76<\/h3>\n
\u8bf7\u8bd5\u8bd5\u4ee5\u4e0b\u7684\u4e2d\u6587\u7f16\u8f91\u65b9\u6848\u3002<\/p>\n
\u64a4\u51fa<\/h3>\n
\u5728\u6267\u884cpull\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u9009\u62e9\u662f\u5426\u521b\u5efa\u5408\u5e76\u63d0\u4ea4\u3002
\n\u53ef\u4ee5\u4ece\u4ee5\u4e0b\u9009\u9879\u4e2d\u9009\u62e9\u3002<\/p>\n
\n
\u5024\u52d5\u4f5c\u30c7\u30d5\u30a9\u30eb\u30c8fast-forward<\/code>\u306a\u5834\u5408\u306fmerge<\/code>\u3057\u3001\u305d\u308c\u4ee5\u5916\u306fmerge commit<\/code>\u3092\u4f5c\u6210\u3002git pull --ff<\/code>\u3068\u540c\u3058\u3002onlyfast-forward<\/code>\u306a\u5834\u5408\u306fmerge<\/code>\u3057\u3001\u305d\u308c\u4ee5\u5916\u306f\u30a8\u30e9\u30fc\u3002git pull –ff-only\u3068\u540c\u3058\u3002false\u5e38\u306bmerge commit<\/code>\u3092\u4f5c\u6210\u3002git pull --no-ff<\/code>\u3068\u540c\u3058\u3002<\/div>\n<\/div>\n
\u63a8\u9001\u9ed8\u8ba4\u503c<\/h3>\n
\u8a2d\u5b9apush\u6642\u7684\u64cd\u4f5c\u3002<\/p>\n
\n
\u5024\u52d5\u4f5cnothing\u5e38\u306b\u3069\u3053\u306bpush\u3059\u308b\u304b\u6307\u5b9a\u3002matching\u30ed\u30fc\u30ab\u30eb\u3068\u30ea\u30e2\u30fc\u30c8\u3067\u540c\u3058\u540d\u524d\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306bpush\u3002upstreamupstream branch\u304c\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u5834\u5408push\u3002simpleupstream branch\u304c\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u304a\u308a\u3001\u30d6\u30e9\u30f3\u30c1\u540d\u304c\u540c\u3058\u5834\u5408push\u3059\u308b\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u3002current\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u306b\u540c\u3058\u540d\u524d\u3067push\u3002<\/div>\n<\/div>\n","protected":false},"excerpt":{"rendered":"
.gitconfig\u7684\u5185\u5bb9 [alias] st = status df = diff co = commit […]<\/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-37366","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u3010Git\u3011\u5173\u4e8e.gitconfig - 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\/\u3010git\u3011\u5173\u4e8e-gitconfig\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u3010Git\u3011\u5173\u4e8e.gitconfig\" \/>\n<meta property=\"og:description\" content=\".gitconfig\u7684\u5185\u5bb9 [alias] st = status df = diff co = commit […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u3011\u5173\u4e8e-gitconfig\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-08-19T16:50:06+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T00:36:04+00:00\" \/>\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=\"1 \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\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/\",\"name\":\"\u3010Git\u3011\u5173\u4e8e.gitconfig - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-08-19T16:50:06+00:00\",\"dateModified\":\"2024-04-29T00:36:04+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u3010Git\u3011\u5173\u4e8e.gitconfig\"}]},{\"@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\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u3010Git\u3011\u5173\u4e8e.gitconfig - 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\/\u3010git\u3011\u5173\u4e8e-gitconfig\/","og_locale":"zh_CN","og_type":"article","og_title":"\u3010Git\u3011\u5173\u4e8e.gitconfig","og_description":".gitconfig\u7684\u5185\u5bb9 [alias] st = status df = diff co = commit […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u3011\u5173\u4e8e-gitconfig\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-08-19T16:50:06+00:00","article_modified_time":"2024-04-29T00:36:04+00:00","author":"\u65b0, \u97f5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u65b0, \u97f5","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/","name":"\u3010Git\u3011\u5173\u4e8e.gitconfig - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-08-19T16:50:06+00:00","dateModified":"2024-04-29T00:36:04+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u3010Git\u3011\u5173\u4e8e.gitconfig"}]},{"@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\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8e-gitconfig\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37366","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=37366"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37366\/revisions"}],"predecessor-version":[{"id":84193,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37366\/revisions\/84193"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37366"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37366"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37366"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}