-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgit.html
More file actions
114 lines (108 loc) · 55.9 KB
/
git.html
File metadata and controls
114 lines (108 loc) · 55.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
<!doctype html>
<html lang="zh-Hans" dir="ltr" class="docs-wrapper plugin-docs plugin-id-default docs-version-current docs-doc-page docs-doc-id-git" data-has-hydrated="false">
<head>
<meta charset="UTF-8">
<meta name="generator" content="Docusaurus v3.8.1">
<title data-rh="true">Git | 缪斯</title><meta data-rh="true" name="viewport" content="width=device-width,initial-scale=1"><meta data-rh="true" name="twitter:card" content="summary_large_image"><meta data-rh="true" property="og:url" content="https://wooyee.cc/git"><meta data-rh="true" property="og:locale" content="zh_Hans"><meta data-rh="true" name="docusaurus_locale" content="zh-Hans"><meta data-rh="true" name="docsearch:language" content="zh-Hans"><meta data-rh="true" name="docusaurus_version" content="current"><meta data-rh="true" name="docusaurus_tag" content="docs-default-current"><meta data-rh="true" name="docsearch:version" content="current"><meta data-rh="true" name="docsearch:docusaurus_tag" content="docs-default-current"><meta data-rh="true" property="og:title" content="Git | 缪斯"><meta data-rh="true" name="description" content="基础命令"><meta data-rh="true" property="og:description" content="基础命令"><link data-rh="true" rel="icon" href="/img/favicon.ico"><link data-rh="true" rel="canonical" href="https://wooyee.cc/git"><link data-rh="true" rel="alternate" href="https://wooyee.cc/git" hreflang="zh-Hans"><link data-rh="true" rel="alternate" href="https://wooyee.cc/git" hreflang="x-default"><script data-rh="true" type="application/ld+json">{"@context":"https://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"name":"Git","item":"https://wooyee.cc/git"}]}</script><link rel="alternate" type="application/rss+xml" href="/about/rss.xml" title="缪斯 RSS Feed">
<link rel="alternate" type="application/atom+xml" href="/about/atom.xml" title="缪斯 Atom Feed">
<meta name="referrer" content="no-referrer"><link rel="stylesheet" href="/assets/css/styles.edfb6952.css">
<script src="/assets/js/runtime~main.8a790f23.js" defer="defer"></script>
<script src="/assets/js/main.d79500d5.js" defer="defer"></script>
</head>
<body class="navigation-with-keyboard">
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><defs>
<symbol id="theme-svg-external-link" viewBox="0 0 24 24"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"/></symbol>
</defs></svg>
<script>!function(){var t="light";var e=function(){try{return new URLSearchParams(window.location.search).get("docusaurus-theme")}catch(t){}}()||function(){try{return window.localStorage.getItem("theme")}catch(t){}}();document.documentElement.setAttribute("data-theme",e||t),document.documentElement.setAttribute("data-theme-choice",e||t)}(),function(){try{const n=new URLSearchParams(window.location.search).entries();for(var[t,e]of n)if(t.startsWith("docusaurus-data-")){var a=t.replace("docusaurus-data-","data-");document.documentElement.setAttribute(a,e)}}catch(t){}}(),document.documentElement.setAttribute("data-announcement-bar-initially-dismissed",function(){try{return"true"===localStorage.getItem("docusaurus.announcement.dismiss")}catch(t){}return!1}())</script><div id="__docusaurus"><div role="region" aria-label="跳到主要内容"><a class="skipToContent_fXgn" href="#__docusaurus_skipToContent_fallback">跳到主要内容</a></div><div class="theme-announcement-bar announcementBar_mb4j" style="background-color:#fafbfc;color:#091E42" role="banner"><div class="announcementBarPlaceholder_vyr4"></div><div class="content_knG7 announcementBarContent_xLdY">⭐️ 如果这个网站能帮助到你，欢迎给一个 star 支持我！<a target="_blank" rel="noopener noreferrer" href="https://github.com/miusing/blog">GitHub</a></div><button type="button" aria-label="关闭" class="clean-btn close closeButton_CVFx announcementBarClose_gvF7"><svg viewBox="0 0 15 15" width="14" height="14"><g stroke="currentColor" stroke-width="3.1"><path d="M.75.75l13.5 13.5M14.25.75L.75 14.25"></path></g></svg></button></div><nav aria-label="主导航" class="theme-layout-navbar navbar navbar--fixed-top navbarHideable_m1mJ"><div class="navbar__inner"><div class="theme-layout-navbar-left navbar__items"><button aria-label="切换导航栏" aria-expanded="false" class="navbar__toggle clean-btn" type="button"><svg width="30" height="30" viewBox="0 0 30 30" aria-hidden="true"><path stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M4 7h22M4 15h22M4 23h22"></path></svg></button><a class="navbar__brand" href="/"><b class="navbar__title text--truncate">亲爱的缪斯</b></a></div><div class="theme-layout-navbar-right navbar__items navbar__items--right"><div class="navbarSearchContainer_Bca1"><div class="navbar__search searchBarContainer_NW3z" dir="ltr"><input placeholder="搜索" aria-label="Search" class="navbar__search-input searchInput_YFbd" value=""><div class="loadingRing_RJI3 searchBarLoadingRing_YnHq"><div></div><div></div><div></div><div></div></div></div></div><a aria-current="page" class="navbar__item navbar__link navbar__link--active" href="/intro">技术文档</a><a class="navbar__item navbar__link" href="/about">关于我</a><a href="https://github.com/miusing/blog" target="_blank" rel="noopener noreferrer" class="navbar__item navbar__link">GitHub<svg width="13.5" height="13.5" aria-hidden="true" class="iconExternalLink_nPIU"><use href="#theme-svg-external-link"></use></svg></a><div class="toggle_vylO colorModeToggle_DEke"><button class="clean-btn toggleButton_gllP toggleButtonDisabled_aARS" type="button" disabled="" title="system mode" aria-label="切换浅色/暗黑模式（当前为system mode）"><svg viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" class="toggleIcon_g3eP lightToggleIcon_pyhR"><path fill="currentColor" d="M12,9c1.65,0,3,1.35,3,3s-1.35,3-3,3s-3-1.35-3-3S10.35,9,12,9 M12,7c-2.76,0-5,2.24-5,5s2.24,5,5,5s5-2.24,5-5 S14.76,7,12,7L12,7z M2,13l2,0c0.55,0,1-0.45,1-1s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S1.45,13,2,13z M20,13l2,0c0.55,0,1-0.45,1-1 s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S19.45,13,20,13z M11,2v2c0,0.55,0.45,1,1,1s1-0.45,1-1V2c0-0.55-0.45-1-1-1S11,1.45,11,2z M11,20v2c0,0.55,0.45,1,1,1s1-0.45,1-1v-2c0-0.55-0.45-1-1-1C11.45,19,11,19.45,11,20z M5.99,4.58c-0.39-0.39-1.03-0.39-1.41,0 c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0s0.39-1.03,0-1.41L5.99,4.58z M18.36,16.95 c-0.39-0.39-1.03-0.39-1.41,0c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0c0.39-0.39,0.39-1.03,0-1.41 L18.36,16.95z M19.42,5.99c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06c-0.39,0.39-0.39,1.03,0,1.41 s1.03,0.39,1.41,0L19.42,5.99z M7.05,18.36c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06 c-0.39,0.39-0.39,1.03,0,1.41s1.03,0.39,1.41,0L7.05,18.36z"></path></svg><svg viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" class="toggleIcon_g3eP darkToggleIcon_wfgR"><path fill="currentColor" d="M9.37,5.51C9.19,6.15,9.1,6.82,9.1,7.5c0,4.08,3.32,7.4,7.4,7.4c0.68,0,1.35-0.09,1.99-0.27C17.45,17.19,14.93,19,12,19 c-3.86,0-7-3.14-7-7C5,9.07,6.81,6.55,9.37,5.51z M12,3c-4.97,0-9,4.03-9,9s4.03,9,9,9s9-4.03,9-9c0-0.46-0.04-0.92-0.1-1.36 c-0.98,1.37-2.58,2.26-4.4,2.26c-2.98,0-5.4-2.42-5.4-5.4c0-1.81,0.89-3.42,2.26-4.4C12.92,3.04,12.46,3,12,3L12,3z"></path></svg><svg viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" class="toggleIcon_g3eP systemToggleIcon_QzmC"><path fill="currentColor" d="m12 21c4.971 0 9-4.029 9-9s-4.029-9-9-9-9 4.029-9 9 4.029 9 9 9zm4.95-13.95c1.313 1.313 2.05 3.093 2.05 4.95s-0.738 3.637-2.05 4.95c-1.313 1.313-3.093 2.05-4.95 2.05v-14c1.857 0 3.637 0.737 4.95 2.05z"></path></svg></button></div></div></div><div role="presentation" class="navbar-sidebar__backdrop"></div></nav><div id="__docusaurus_skipToContent_fallback" class="theme-layout-main main-wrapper mainWrapper_z2l0"><div class="docsWrapper_hBAB"><button aria-label="回到顶部" class="clean-btn theme-back-to-top-button backToTopButton_sjWU" type="button"></button><div class="docRoot_UBD9"><aside class="theme-doc-sidebar-container docSidebarContainer_YfHR"><div class="sidebarViewport_aRkj"><div class="sidebar_njMd sidebarWithHideableNavbar_wUlq"><a tabindex="-1" class="sidebarLogo_isFc" href="/"><b>亲爱的缪斯</b></a><nav aria-label="文档侧边栏" class="menu thin-scrollbar menu_SIkG menuWithAnnouncementBar_GW3s"><ul class="theme-doc-sidebar-menu menu__list"><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/intro">欢迎来到缪斯的技术博客</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/browser">浏览器底层原理</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/HTML">HTML</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/css">CSS</a></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist" href="/javascript/basic">JavaScript</a><button aria-label="展开侧边栏分类 'JavaScript'" aria-expanded="false" type="button" class="clean-btn menu__caret"></button></div></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist menu__link--sublist-caret" role="button" aria-expanded="false" href="/typescript/config">Typescript</a></div></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist menu__link--sublist-caret" role="button" aria-expanded="false" href="/node/module">Node</a></div></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/vue">Vue</a></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist" href="/react">React</a><button aria-label="展开侧边栏分类 'React'" aria-expanded="false" type="button" class="clean-btn menu__caret"></button></div></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist" href="/infra/前端工程化">前端工程化</a><button aria-label="展开侧边栏分类 '前端工程化'" aria-expanded="false" type="button" class="clean-btn menu__caret"></button></div></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/binary">二进制与编码</a></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist menu__link--sublist-caret" role="button" aria-expanded="false" href="/canvas">Canvas</a></div></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist menu__link--sublist-caret" role="button" aria-expanded="false" href="/canvas/webgl">WebGL</a></div></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link menu__link--active" aria-current="page" href="/git">Git</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/音视频学习">音视频学习</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/计算机网络">计算机网络</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/前端安全">前端安全</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/异常处理">异常处理</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/编译原理">编译原理</a></li><li class="theme-doc-sidebar-item-category theme-doc-sidebar-item-category-level-1 menu__list-item menu__list-item--collapsed"><div class="menu__list-item-collapsible"><a class="menu__link menu__link--sublist menu__link--sublist-caret" role="button" aria-expanded="false" href="/rust/setup">Rust</a></div></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/网站优化">性能优化</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/数据结构">数据结构</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/排序">排序算法</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/编程题">编程题</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/mongodb">MongoDB</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/mysql">Mysql</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/linux">Linux</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/docker">Docker</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/设计模式">设计模式</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/websocket">WebSocket</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/webgl">Three.js</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/php">php</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/写在前面">写在前面</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/其它">其它</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/代码段记录">代码段记录</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/第三方库">第三方库</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/面试题">面试题</a></li><li class="theme-doc-sidebar-item-link theme-doc-sidebar-item-link-level-1 menu__list-item"><a class="menu__link" href="/akara的考验">akara的考验</a></li></ul></nav><button type="button" title="收起侧边栏" aria-label="收起侧边栏" class="button button--secondary button--outline collapseSidebarButton_PEFL"><svg width="20" height="20" aria-hidden="true" class="collapseSidebarButtonIcon_kv0_"><g fill="#7a7a7a"><path d="M9.992 10.023c0 .2-.062.399-.172.547l-4.996 7.492a.982.982 0 01-.828.454H1c-.55 0-1-.453-1-1 0-.2.059-.403.168-.551l4.629-6.942L.168 3.078A.939.939 0 010 2.528c0-.548.45-.997 1-.997h2.996c.352 0 .649.18.828.45L9.82 9.472c.11.148.172.347.172.55zm0 0"></path><path d="M19.98 10.023c0 .2-.058.399-.168.547l-4.996 7.492a.987.987 0 01-.828.454h-3c-.547 0-.996-.453-.996-1 0-.2.059-.403.168-.551l4.625-6.942-4.625-6.945a.939.939 0 01-.168-.55 1 1 0 01.996-.997h3c.348 0 .649.18.828.45l4.996 7.492c.11.148.168.347.168.55zm0 0"></path></g></svg></button></div></div></aside><main class="docMainContainer_TBSr"><div class="container padding-top--md padding-bottom--lg"><div class="row"><div class="col docItemCol_VOVn"><div class="docItemContainer_Djhp"><article><nav class="theme-doc-breadcrumbs breadcrumbsContainer_Z_bl" aria-label="页面路径"><ul class="breadcrumbs"><li class="breadcrumbs__item"><a aria-label="主页面" class="breadcrumbs__link" href="/"><svg viewBox="0 0 24 24" class="breadcrumbHomeIcon_YNFT"><path d="M10 19v-5h4v5c0 .55.45 1 1 1h3c.55 0 1-.45 1-1v-7h1.7c.46 0 .68-.57.33-.87L12.67 3.6c-.38-.34-.96-.34-1.34 0l-8.36 7.53c-.34.3-.13.87.33.87H5v7c0 .55.45 1 1 1h3c.55 0 1-.45 1-1z" fill="currentColor"></path></svg></a></li><li class="breadcrumbs__item breadcrumbs__item--active"><span class="breadcrumbs__link">Git</span></li></ul></nav><div class="tocCollapsible_ETCw theme-doc-toc-mobile tocMobile_ITEo"><button type="button" class="clean-btn tocCollapsibleButton_TO0P">本页总览</button></div><div class="theme-doc-markdown markdown"><header><h1>Git</h1></header>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="基础命令">基础命令<a href="#基础命令" class="hash-link" aria-label="基础命令的直接链接" title="基础命令的直接链接"></a></h2>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 初始化git仓库</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git init </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 查看提交记录</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git log </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 查看历史命令</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git reflog </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 查看当前状态</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git status </span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-restore">git restore<a href="#git-restore" class="hash-link" aria-label="git restore的直接链接" title="git restore的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 工作目录内容添加进索引区域</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git add <name></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git add .</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 当修改了工作区的文件但还未暂存更改（git add）时，可以通过该命令放弃更改</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git restore <name> </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git restore .</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 当修改了工作区的文件并且暂存更改时，可以通过该命令放弃暂存更改，变成尚未git add的状态</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git restore --staged <name></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git restore --staged .</span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-commit">git commit<a href="#git-commit" class="hash-link" aria-label="git commit的直接链接" title="git commit的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 根据暂存区的内容生成新的commit</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git commit</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git commit -m 'feat: moyu' </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 可以用来重写当前的commit内容和消息，可以用来保证提交记录的简洁</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git commit --amend </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git commit --amend --reset-author </span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-branch">git branch<a href="#git-branch" class="hash-link" aria-label="git branch的直接链接" title="git branch的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 显示所有分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 显示所有远程分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch -r</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 创建分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch <name> </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 删除本地分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch -D <name> </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 修改分支名</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch -m <nameA> <nameB> </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 切换分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git checkout <name> </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 切换到上一个分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git checkout - </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 创建分支并切换过去</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git checkout -b <name> </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 查看分支的track信息</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch -vv</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 设置当前分支的上游分支，等价于--set-upstream</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch -u origin/feature</span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-tag">git tag<a href="#git-tag" class="hash-link" aria-label="git tag的直接链接" title="git tag的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 查看所有tag</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git tag </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 给当前commit打tag</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git tag v1.0.1 </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 给某个commit打tag</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git tag v1.0.1 <commit> </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 删除tag</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git tag --delete v1.0.1 </span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-stash">git stash<a href="#git-stash" class="hash-link" aria-label="git stash的直接链接" title="git stash的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 暂存工作区的修改</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git stash </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 查看已stash的内容</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git stash list </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 释放最新stash的内容到工作区</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git stash pop 0 </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 清空暂存区的内容</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git stash clear</span><br></span></code></pre></div></div>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="分支合并">分支合并<a href="#分支合并" class="hash-link" aria-label="分支合并的直接链接" title="分支合并的直接链接"></a></h2>
<p><code>git</code>存在两种分支合并的策略，即<code>git merge</code>和<code>git rebase</code>。本人强烈建议使用<code>git rebase</code>来进行分支管理，首先这种策略十分简单，而且能保证提交历史非常简洁。</p>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-merge">git merge<a href="#git-merge" class="hash-link" aria-label="git merge的直接链接" title="git merge的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 合并目标分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git merge <name> </span><br></span></code></pre></div></div>
<p>使用<code>git merge</code>时，根据分支情况的不同会存在两种合并情况， <code>fast-forward</code>（快进）和<code>non-fast-forward</code>。多人协作的时候多数是<code>non-fast-forward</code>的情况，此时合并分支会创建一个新的提交。</p>
<h4 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="fast-forward">fast-forward<a href="#fast-forward" class="hash-link" aria-label="fast-forward的直接链接" title="fast-forward的直接链接"></a></h4>
<p><img decoding="async" loading="lazy" src="https://backlog.com/git-tutorial/cn/img/post/stepup/capture_stepup1_4_1.png" alt="fast-forward" class="img_ev3q"></p>
<p><img decoding="async" loading="lazy" src="https://backlog.com/git-tutorial/cn/img/post/stepup/capture_stepup1_4_2.png" alt="fast-forward合并" class="img_ev3q"></p>
<h4 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="non-fast-forward">non-fast-forward<a href="#non-fast-forward" class="hash-link" aria-label="non-fast-forward的直接链接" title="non-fast-forward的直接链接"></a></h4>
<p><img decoding="async" loading="lazy" src="https://backlog.com/git-tutorial/cn/img/post/stepup/capture_stepup1_4_3.png" alt="分支合并" class="img_ev3q"></p>
<p><img decoding="async" loading="lazy" src="https://backlog.com/git-tutorial/cn/img/post/stepup/capture_stepup1_4_4.png" alt="分支合并结果" class="img_ev3q"></p>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-rebase">git rebase<a href="#git-rebase" class="hash-link" aria-label="git rebase的直接链接" title="git rebase的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 合并目标分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git rebase <name> </span><br></span></code></pre></div></div>
<p><img decoding="async" loading="lazy" src="https://backlog.com/git-tutorial/cn/img/post/stepup/capture_stepup1_4_6.png" alt="git-rebase" class="img_ev3q"></p>
<p><img decoding="async" loading="lazy" src="https://backlog.com/git-tutorial/cn/img/post/stepup/capture_stepup1_4_7.png" alt="git-rebase结果" class="img_ev3q"></p>
<h4 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="冲突">冲突<a href="#冲突" class="hash-link" aria-label="冲突的直接链接" title="冲突的直接链接"></a></h4>
<p><code>git rebase</code>时如果碰到代码冲突，在解决完冲突后通过<code>git add .</code>和<code>git rebase --continue</code>可进入下一步；如果又不想要合并了，也可以通过<code>git rebase --abort</code>放弃合并。</p>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="远程操作">远程操作<a href="#远程操作" class="hash-link" aria-label="远程操作的直接链接" title="远程操作的直接链接"></a></h2>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain">git remote # 查看远程仓库的信息</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git remote add origin <url> # 添加仓库地址映射</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git remote remove origin # 删除地址映射</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git clone <url> # 拉取远程仓库到本地</span><br></span></code></pre></div></div>
<p>大多数情况下，我们的本地仓库只需要和一个远程仓库进行关联，此时通常会使用特殊的标识<code>origin</code>来代表这个远程仓库。</p>
<p>在少数情况下本地仓库需要和多个远程仓库进行关联，一种常见的场景是我们想要给<em>Github</em>的某个开源库贡献代码，这时候我们会先<code>fork</code>并把<code>fork</code>后生成的仓库<code>clone</code>到本地，此时<code>origin</code>代表着自己的远程仓库，通常我们还会手动通过<code>git remote add upstream <url></code>来关联原本的开源库用于更新最新代码，此时<code>upstream</code>代表原本的开源库。</p>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="remote-tracking-branch">Remote-Tracking Branch<a href="#remote-tracking-branch" class="hash-link" aria-label="Remote-Tracking Branch的直接链接" title="Remote-Tracking Branch的直接链接"></a></h3>
<p>远程仓库的分支通常被称为<strong>远程分支</strong>（<em>Remote Branch</em>），通常可以在Github或Gitlab上进行查看。</p>
<p>与之相关的一个重要概念叫做<strong>远程跟踪分支</strong>（<em>Remote-Tracking Branch</em>），通常以类似<code>origin/master</code>的形式表示，在执行如<code>git fetch</code>、<code>git push</code>、<code>git pull</code>这样的远程 操作后git会自动移动对应的远程跟踪分支，以确保它总是指向远程仓库对应的分支。</p>
<p>在使用<code>git clone</code>来生成本地仓库时，不仅默认会使用<code>origin</code>来表示远程仓库，还会自动给本地分支建立追踪关系，如<code>master</code>分支会自动追踪<code>origin/master</code>，此时也会把<code>master</code>分支称为<em><strong>Tracking Branch</strong></em>，把<code>origin/master</code>称为<strong>上游分支</strong>（Upstream branch）。事实上，当不指定分支信息直接执行<code>git push</code>或<code>git pull</code>时，会根据当前分支的追踪关系来决定目标分支。</p>
<h4 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-branch--vv">git branch -vv<a href="#git-branch--vv" class="hash-link" aria-label="git branch -vv的直接链接" title="git branch -vv的直接链接"></a></h4>
<p>使用<code>git branch -vv</code>可以查看所有的追踪信息</p>
<h4 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="设置上游分支">设置上游分支<a href="#设置上游分支" class="hash-link" aria-label="设置上游分支的直接链接" title="设置上游分支的直接链接"></a></h4>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 希望feature分支跟踪origin/master分支的四种写法</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch -u origin/master <branchname></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch -u origin/master # 不指定branchname时默认为当前分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch --set-upstream-to=origin/master <branchname></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git branch --set-upstream-to=origin/master</span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-fetch">git fetch<a href="#git-fetch" class="hash-link" aria-label="git fetch的直接链接" title="git fetch的直接链接"></a></h3>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 获取所有remote的远程提交和分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git fetch </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 拉取origin remote的远程提交和分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git fetch origin </span><br></span></code></pre></div></div>
<p><code>git fetch</code>会拉取目标<code>remote</code>的所有提交并更新本地的远程跟踪分支。因此可以直接<code>git rebase</code>最新的远程跟踪分支来获取最新的代码，比如：</p>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain">git fetch && git rebase origin/master</span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-pull">git pull<a href="#git-pull" class="hash-link" aria-label="git pull的直接链接" title="git pull的直接链接"></a></h3>
<p>本质上，<code>git pull</code>命令会使用给定的参数运行<code>git fetch</code>命令，并默认使用<code>git merge</code>策略来合并目标分支，因此<code>git pull origin master</code>等价于<code>git fetch origin master && git merge origin/master</code>。</p>
<p>我们也可以调整<code>git pull</code>时采用的分支合并策略：</p>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain">git config pull.rebase false # git merge（默认）</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git config pull.rebase true # git rebase（个人推荐）</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git config pull.ff only # git merge but fast-forward only</span><br></span></code></pre></div></div>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-push">git push<a href="#git-push" class="hash-link" aria-label="git push的直接链接" title="git push的直接链接"></a></h3>
<p><code>git push</code>用于推送指定分支到目标<code>remote</code>。</p>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain">git push origin main # 将本仓库的main分支推送到origin的main分支</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git push origin test --delete # 删除远程分支</span><br></span></code></pre></div></div>
<p>更进阶的用法，我们可以把本地的<code>A</code>分支推送到远程的<code>B</code>分支</p>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain">git push origin branchA:branchB</span><br></span></code></pre></div></div>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="版本回退">版本回退<a href="#版本回退" class="hash-link" aria-label="版本回退的直接链接" title="版本回退的直接链接"></a></h2>
<p>通过<code>git reset --hard</code>即可实现版本回退和前进，本质上是切换<code>HEAD</code>指针所指向的提交，<code>HEAD^</code>表示<code>HEAD</code>的上一个提交，<code>HEAD~2</code>表示<code>HEAD</code>的上两个提交。</p>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 回退到上一个commit</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git reset --hard HEAD^ </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git reset --hard Head^^ </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git reset --hard Head~3 </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"> # 回退到上一个commit，但当前commit修改的内容并不会消失，而是保存在工作目录中</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git reset head^</span><br></span></code></pre></div></div>
<p>除了<code>git reset</code>，我们还可以使用<code>git revert</code>来撤销某次的提交，<code>git revert</code>会产生一个新的提交。</p>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 撤销当前commit</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git revert HEAD </span><br></span></code></pre></div></div>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-rebase--i">git rebase -i<a href="#git-rebase--i" class="hash-link" aria-label="git rebase -i的直接链接" title="git rebase -i的直接链接"></a></h2>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain">git rebase -i origin/main </span><br></span></code></pre></div></div>
<p>通过交互式的<code>git rebase</code>可以实现提交的压缩、删除、顺序切换、编辑某个历史提交等功能。</p>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-cherry-pick">git cherry-pick<a href="#git-cherry-pick" class="hash-link" aria-label="git cherry-pick的直接链接" title="git cherry-pick的直接链接"></a></h2>
<div class="language-shell codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-shell codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain">git cherry-pick <commit></span><br></span></code></pre></div></div>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="底层原理">底层原理<a href="#底层原理" class="hash-link" aria-label="底层原理的直接链接" title="底层原理的直接链接"></a></h2>
<blockquote>
<p><a href="https://zhuanlan.zhihu.com/p/96631135" target="_blank" rel="noopener noreferrer">参考</a></p>
</blockquote>
<p><code>commit</code>节点通过 <code>tree</code>节点记录着某个时刻对应的文件信息，这些对应的文件保存在索引区域中（严格来说，这些文件被当作 <code>object</code>节点存于 <code>git</code>仓库中，索引指向着这些文件），当我们切换到某个 <code>commit</code>时，会根据索引把对应的文件同步到工作目录中。</p>
<p>通常当我们修改工作目录中的文件后，通过 <code>git add</code>把更新同步到索引中（即在 <code>git</code>仓库中创建一个 新的 <code>object</code>结点，并更新索引的指向），然后使用 <code>git commit</code>来生成一个新的 <code>commit</code>节点（即先根据索引的指向生成一个 <code>tree</code>节点，再生成 <code>commit</code>节点），新的 <code>commit</code>节点记录着新的文件信息。</p>
<p>假设 <code>commitA</code>和 <code>commitB</code>都记录着文件 <code>test</code>，那么当我们处于 <code>commitA</code>时并修改工作目录的文件后，或者已经同步到索引区域，只要还没有提交记录的话，这时候如果我们切换到 <code>commitB</code>，那我们的本地修改会同步到 <code>commitB</code>当中。</p>
<p>不过，如果我们在 <code>commitA</code>记录着文件 <code>a</code>，而 <code>commitB</code>中不存在文件 <code>a</code>，然后我们处于 <code>commitA</code>时修改文件 <code>a</code>，这时候直接切换到 <code>commitB</code>就会失败，并且会提醒我们应该先提交我们的修改，或者可以使用 <code>git stash</code>来把我们的修改暂存到 <code>commitA</code>中。</p>
<p>比如我们可以先使用 <code>git stash</code>暂存修改，然后就可以直接切换到 <code>commitB</code>了，未来回到 <code>commitA</code>时又可以使用 <code>git stash pop</code>把暂存的修改内容拿出来。</p>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="git-object">git object<a href="#git-object" class="hash-link" aria-label="git object的直接链接" title="git object的直接链接"></a></h3>
<div class="language-bash codeBlockContainer_Ckt0 theme-code-block" style="--prism-color:#393A34;--prism-background-color:#f6f8fa"><div class="codeBlockContent_QJqH"><pre tabindex="0" class="prism-code language-bash codeBlock_bY9V thin-scrollbar" style="color:#393A34;background-color:#f6f8fa"><code class="codeBlockLines_e6Vv"><span class="token-line" style="color:#393A34"><span class="token plain"># 显示所有object</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">ls .git/objects/</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">10/ ea/ 1c/ ... /info /pack</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain" style="display:inline-block"></span><br></span><span class="token-line" style="color:#393A34"><span class="token plain"># 查看object类型/值，常见类型：blob(git add 后创建), tree和commit(git commit 后创建)</span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git cat-file -t 58c9 </span><br></span><span class="token-line" style="color:#393A34"><span class="token plain">git cat-file -p 58c9 # 58c9为想找的object的值</span><br></span></code></pre></div></div>
<h2 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="其他">其他<a href="#其他" class="hash-link" aria-label="其他的直接链接" title="其他的直接链接"></a></h2>
<h3 class="anchor anchorWithHideOnScrollNavbar_WYt5" id="gitkeep">.gitkeep<a href="#gitkeep" class="hash-link" aria-label=".gitkeep的直接链接" title=".gitkeep的直接链接"></a></h3>
<p><code>git</code>通常无法追踪空文件夹，如果我们追踪空文件夹，可以在该文件夹下新建一个空的 <code>.gitkeep</code>文件。</p>
<blockquote>
<p>当我们新建文件 <code>akara.txt</code>，并使用 <code>git add .</code>添加进缓存区。此时我们可以：</p>
<ol>
<li><code>git commit -m ''</code>： 提交记录。</li>
<li><code>git reset HEAD <file></code>: 释放缓存。类似的还有 <code>git rm --cached <file></code>用来删除缓存区的内容</li>
</ol>
<p>当我们新建文件 <code>akara.txt</code>，并使用 <code>git add .</code>添加进缓存区，之后修改该文件的内容。此时我们可以：</p>
<ol>
<li><code>git add .</code>：缓存修改后的内容。</li>
<li><code>git checkout -- <file> </code>：丢弃修改的内容。本质是用原本缓存区的内容替代工作目录中的文件内容。</li>
</ol>
</blockquote></div><footer class="theme-doc-footer docusaurus-mt-lg"><div class="row margin-top--sm theme-doc-footer-edit-meta-row"><div class="col"><a href="https://github.com/miusing/blog/tree/master/docs/git.md" target="_blank" rel="noopener noreferrer" class="theme-edit-this-page"><svg fill="currentColor" height="20" width="20" viewBox="0 0 40 40" class="iconEdit_Z9Sw" aria-hidden="true"><g><path d="m34.5 11.7l-3 3.1-6.3-6.3 3.1-3q0.5-0.5 1.2-0.5t1.1 0.5l3.9 3.9q0.5 0.4 0.5 1.1t-0.5 1.2z m-29.5 17.1l18.4-18.5 6.3 6.3-18.4 18.4h-6.3v-6.2z"></path></g></svg>编辑此页</a></div><div class="col lastUpdated_JAkA"></div></div></footer></article><nav class="docusaurus-mt-lg pagination-nav" aria-label="文件选项卡"><a class="pagination-nav__link pagination-nav__link--prev" href="/canvas/unity"><div class="pagination-nav__sublabel">上一页</div><div class="pagination-nav__label">unity</div></a><a class="pagination-nav__link pagination-nav__link--next" href="/音视频学习"><div class="pagination-nav__sublabel">下一页</div><div class="pagination-nav__label">音视频学习</div></a></nav></div></div><div class="col col--3"><div class="tableOfContents_bqdL thin-scrollbar theme-doc-toc-desktop"><ul class="table-of-contents table-of-contents__left-border"><li><a href="#基础命令" class="table-of-contents__link toc-highlight">基础命令</a><ul><li><a href="#git-restore" class="table-of-contents__link toc-highlight">git restore</a></li><li><a href="#git-commit" class="table-of-contents__link toc-highlight">git commit</a></li><li><a href="#git-branch" class="table-of-contents__link toc-highlight">git branch</a></li><li><a href="#git-tag" class="table-of-contents__link toc-highlight">git tag</a></li><li><a href="#git-stash" class="table-of-contents__link toc-highlight">git stash</a></li></ul></li><li><a href="#分支合并" class="table-of-contents__link toc-highlight">分支合并</a><ul><li><a href="#git-merge" class="table-of-contents__link toc-highlight">git merge</a></li><li><a href="#git-rebase" class="table-of-contents__link toc-highlight">git rebase</a></li></ul></li><li><a href="#远程操作" class="table-of-contents__link toc-highlight">远程操作</a><ul><li><a href="#remote-tracking-branch" class="table-of-contents__link toc-highlight">Remote-Tracking Branch</a></li><li><a href="#git-fetch" class="table-of-contents__link toc-highlight">git fetch</a></li><li><a href="#git-pull" class="table-of-contents__link toc-highlight">git pull</a></li><li><a href="#git-push" class="table-of-contents__link toc-highlight">git push</a></li></ul></li><li><a href="#版本回退" class="table-of-contents__link toc-highlight">版本回退</a></li><li><a href="#git-rebase--i" class="table-of-contents__link toc-highlight">git rebase -i</a></li><li><a href="#git-cherry-pick" class="table-of-contents__link toc-highlight">git cherry-pick</a></li><li><a href="#底层原理" class="table-of-contents__link toc-highlight">底层原理</a><ul><li><a href="#git-object" class="table-of-contents__link toc-highlight">git object</a></li></ul></li><li><a href="#其他" class="table-of-contents__link toc-highlight">其他</a><ul><li><a href="#gitkeep" class="table-of-contents__link toc-highlight">.gitkeep</a></li></ul></li></ul></div></div></div></div></main></div></div></div></div>
</body>
</html>