ruoneo
/
blog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
4 Commits
1 Branch
0 Tags
18 MiB
 
 
 
Tag: Branch: Tree: main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
blog/public/2021/06/10/Git常用命令/index.html

477 lines
42 KiB
Raw Permalink Blame History

<!DOCTYPE html><html lang="zh-CN" data-theme="light"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><title>Git常用命令 | 水榭听泉</title><meta name="author" content="Ruoneo"><meta name="copyright" content="Ruoneo"><meta name="format-detection" content="telephone=no"><meta name="theme-color" content="#ffffff"><meta name="description" content="作者：gybguohao 链接：https:&#x2F;&#x2F;www.jianshu.com&#x2F;p&#x2F;cdccfef91ae1 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。 简介 git有四个工作区域，分别是：工作目录（Workspace）、暂存区（Index&#x2F;Stage）、本地仓库（Repository）、远程仓库（Remote） 配置 git config git conf">
<meta property="og:type" content="article">
<meta property="og:title" content="Git常用命令">
<meta property="og:url" content="https://ismaxu.com/2021/06/10/Git%E5%B8%B8%E7%94%A8%E5%91%BD%E4%BB%A4/index.html">
<meta property="og:site_name" content="水榭听泉">
<meta property="og:description" content="作者：gybguohao 链接：https:&#x2F;&#x2F;www.jianshu.com&#x2F;p&#x2F;cdccfef91ae1 来源：简书 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。 简介 git有四个工作区域，分别是：工作目录（Workspace）、暂存区（Index&#x2F;Stage）、本地仓库（Repository）、远程仓库（Remote） 配置 git config git conf">
<meta property="og:locale" content="zh_CN">
<meta property="og:image" content="https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg">
<meta property="article:published_time" content="2021-06-10T07:29:26.000Z">
<meta property="article:modified_time" content="2021-12-20T11:45:34.000Z">
<meta property="article:author" content="Ruoneo">
<meta name="twitter:card" content="summary">
<meta name="twitter:image" content="https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg"><link rel="shortcut icon" href="/img/avatar.jpg"><link rel="canonical" href="https://ismaxu.com/2021/06/10/Git%E5%B8%B8%E7%94%A8%E5%91%BD%E4%BB%A4/"><link rel="preconnect" href="//cdn.jsdelivr.net"/><link rel="stylesheet" href="/css/index.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css" media="print" onload="this.media='all'"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox.min.css" media="print" onload="this.media='all'"><script>const GLOBAL_CONFIG = {
root: '/',
algolia: undefined,
localSearch: {"path":"/search.xml","preload":false,"languages":{"hits_empty":"找不到您查询的内容：${query}"}},
translate: undefined,
noticeOutdate: undefined,
highlight: {"plugin":"highlighjs","highlightCopy":true,"highlightLang":true,"highlightHeightLimit":false},
copy: {
success: '复制成功',
error: '复制错误',
noSupport: '浏览器不支持'
},
relativeDate: {
homepage: false,
post: false
},
runtime: '',
date_suffix: {
just: '刚刚',
min: '分钟前',
hour: '小时前',
day: '天前',
month: '个月前'
},
copyright: undefined,
lightbox: 'fancybox',
Snackbar: undefined,
source: {
justifiedGallery: {
js: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery/dist/fjGallery.min.js',
css: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery/dist/fjGallery.min.css'
}
},
isPhotoFigcaption: false,
islazyload: true,
isAnchor: false
}</script><script id="config-diff">var GLOBAL_CONFIG_SITE = {
title: 'Git常用命令',
isPost: true,
isHome: false,
isHighlightShrink: false,
isToc: true,
postUpdate: '2021-12-20 19:45:34'
}</script><noscript><style type="text/css">
#nav {
opacity: 1
}
.justified-gallery img {
opacity: 1
}
#recent-posts time,
#post-meta time {
display: inline !important
}
</style></noscript><script>(win=>{
win.saveToLocal = {
set: function setWithExpiry(key, value, ttl) {
if (ttl === 0) return
const now = new Date()
const expiryDay = ttl * 86400000
const item = {
value: value,
expiry: now.getTime() + expiryDay,
}
localStorage.setItem(key, JSON.stringify(item))
},
get: function getWithExpiry(key) {
const itemStr = localStorage.getItem(key)
if (!itemStr) {
return undefined
}
const item = JSON.parse(itemStr)
const now = new Date()
if (now.getTime() > item.expiry) {
localStorage.removeItem(key)
return undefined
}
return item.value
}
}
win.getScript = url => new Promise((resolve, reject) => {
const script = document.createElement('script')
script.src = url
script.async = true
script.onerror = reject
script.onload = script.onreadystatechange = function() {
const loadState = this.readyState
if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
script.onload = script.onreadystatechange = null
resolve()
}
document.head.appendChild(script)
})
win.activateDarkMode = function () {
document.documentElement.setAttribute('data-theme', 'dark')
if (document.querySelector('meta[name="theme-color"]') !== null) {
document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
}
}
win.activateLightMode = function () {
document.documentElement.setAttribute('data-theme', 'light')
if (document.querySelector('meta[name="theme-color"]') !== null) {
document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
}
}
const t = saveToLocal.get('theme')
if (t === 'dark') activateDarkMode()
else if (t === 'light') activateLightMode()
const asideStatus = saveToLocal.get('aside-status')
if (asideStatus !== undefined) {
if (asideStatus === 'hide') {
document.documentElement.classList.add('hide-aside')
} else {
document.documentElement.classList.remove('hide-aside')
}
}
const detectApple = () => {
if(/iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent)){
document.documentElement.classList.add('apple')
}
}
detectApple()
})(window)</script><meta name="generator" content="Hexo 6.2.0"></head><body><div id="web_bg"></div><div id="sidebar"><div id="menu-mask"></div><div id="sidebar-menus"><div class="avatar-img is-center"><img src="/img/avatar.jpg" onerror="onerror=null;src='/img/friend_404.gif'" alt="avatar"/></div><div class="sidebar-site-data site-data is-center"><a href="/archives/"><div class="headline">文章</div><div class="length-num">64</div></a><a href="/tags/"><div class="headline">标签</div><div class="length-num">26</div></a><a href="/categories/"><div class="headline">分类</div><div class="length-num">4</div></a></div><hr/><div class="menus_items"><div class="menus_item"><a class="site-page" href="/"><i class="fa-fw fas fa-home"></i><span> 首页</span></a></div><div class="menus_item"><a class="site-page" href="/archives/"><i class="fa-fw fas fa-archive"></i><span> 时间轴</span></a></div><div class="menus_item"><a class="site-page" href="/tags/"><i class="fa-fw fas fa-tags"></i><span> 标签</span></a></div><div class="menus_item"><a class="site-page" href="/categories/"><i class="fa-fw fas fa-folder-open"></i><span> 分类</span></a></div><div class="menus_item"><a class="site-page" href="/messageboard/"><i class="fa-fw fas fa-comment-dots"></i><span> 留言板</span></a></div><div class="menus_item"><a class="site-page" href="/links/"><i class="fa-fw fas fa-link"></i><span> 友链</span></a></div><div class="menus_item"><a class="site-page" href="/about/"><i class="fa-fw fas fa-heart"></i><span> 关于</span></a></div></div></div></div><div class="post" id="body-wrap"><header class="post-bg" id="page-header" style="background-image: url('https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg')"><nav id="nav"><span id="blog_name"><a id="site-name" href="/">水榭听泉</a></span><div id="menus"><div id="search-button"><a class="site-page social-icon search"><i class="fas fa-search fa-fw"></i><span> 搜索</span></a></div><div class="menus_items"><div class="menus_item"><a class="site-page" href="/"><i class="fa-fw fas fa-home"></i><span> 首页</span></a></div><div class="menus_item"><a class="site-page" href="/archives/"><i class="fa-fw fas fa-archive"></i><span> 时间轴</span></a></div><div class="menus_item"><a class="site-page" href="/tags/"><i class="fa-fw fas fa-tags"></i><span> 标签</span></a></div><div class="menus_item"><a class="site-page" href="/categories/"><i class="fa-fw fas fa-folder-open"></i><span> 分类</span></a></div><div class="menus_item"><a class="site-page" href="/messageboard/"><i class="fa-fw fas fa-comment-dots"></i><span> 留言板</span></a></div><div class="menus_item"><a class="site-page" href="/links/"><i class="fa-fw fas fa-link"></i><span> 友链</span></a></div><div class="menus_item"><a class="site-page" href="/about/"><i class="fa-fw fas fa-heart"></i><span> 关于</span></a></div></div><div id="toggle-menu"><a class="site-page"><i class="fas fa-bars fa-fw"></i></a></div></div></nav><div id="post-info"><h1 class="post-title">Git常用命令<a class="post-edit-link" href="https://git.ismaxu.com/ruoneo/hexo-generator/src/branch/main/source/_posts/Git常用命令.md" title="编辑" target="_blank"><i class="fas fa-pencil-alt"></i></a></h1><div id="post-meta"><div class="meta-firstline"><span class="post-meta-date"><i class="far fa-calendar-alt fa-fw post-meta-icon"></i><span class="post-meta-label">发表于</span><time class="post-meta-date-created" datetime="2021-06-10T07:29:26.000Z" title="发表于 2021-06-10 15:29:26">2021-06-10</time><span class="post-meta-separator">|</span><i class="fas fa-history fa-fw post-meta-icon"></i><span class="post-meta-label">更新于</span><time class="post-meta-date-updated" datetime="2021-12-20T11:45:34.000Z" title="更新于 2021-12-20 19:45:34">2021-12-20</time></span></div><div class="meta-secondline"><span class="post-meta-separator">|</span><span class="post-meta-wordcount"><i class="far fa-file-word fa-fw post-meta-icon"></i><span class="post-meta-label">字数总计:</span><span class="word-count">3.3k</span><span class="post-meta-separator">|</span><i class="far fa-clock fa-fw post-meta-icon"></i><span class="post-meta-label">阅读时长:</span><span>11分钟</span></span></div></div></div></header><main class="layout" id="content-inner"><div id="post"><article class="post-content" id="article-container"><h2 id="Git常用命令-md-fig-0-png"><img src="https://imgs-1302910354.cos.ap-shanghai.myqcloud.com/images/Git%E5%B8%B8%E7%94%A8%E5%91%BD%E4%BB%A4.md-fig-0.png" alt="Git常用命令.md-fig-0.png"></h2>
<p>作者：gybguohao<br>
链接：<a target="_blank" rel="noopener" href="https://www.jianshu.com/p/cdccfef91ae1">https://www.jianshu.com/p/cdccfef91ae1</a><br>
来源：简书<br>
著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。</p>
<h2 id="简介">简介</h2>
<p>git有四个工作区域，分别是：工作目录（Workspace）、暂存区（Index/Stage）、本地仓库（Repository）、远程仓库（Remote）</p>
<h2 id="配置">配置</h2>
<h3 id="git-config">git config</h3>
<p>git config命令的作用是配置git的相关信息。</p>
<ol>
<li>配置全局的用户名和邮箱，mac下可通过终端输入命令cat ~/.gitconfig查看配置信息。
<ul>
<li>设置用户名：git config --global <a target="_blank" rel="noopener" href="http://user.name">user.name</a> “name”</li>
<li>设置用户邮箱：git config --global user.email “eamil”</li>
</ul>
</li>
<li>针对单个仓库配置用户名和邮箱，mac下可通过终端进入到项目的根目录中，然后输入命令cat .git/config查看配置信息。
<ul>
<li>设置用户名：git config <a target="_blank" rel="noopener" href="http://user.name">user.name</a> “name”</li>
<li>设置用户邮箱：git config user.email “eamil”</li>
</ul>
</li>
<li>查看git所有配置信息：git config --list</li>
<li>查看配置的用户名：git config <a target="_blank" rel="noopener" href="http://user.name">user.name</a></li>
<li>查看配置的用户邮箱：git config user.email</li>
<li>定义命令别名：
<ul>
<li>git config --global <a target="_blank" rel="noopener" href="http://alias.st">alias.st</a> status：则git status可用git st代替</li>
<li>git config --global <a target="_blank" rel="noopener" href="http://alias.co">alias.co</a> checkout：则git checkout可用git co代替</li>
<li>git config --global <a target="_blank" rel="noopener" href="http://alias.ci">alias.ci</a> commit：则git commit可用git ci代替</li>
<li>git config --global <a target="_blank" rel="noopener" href="http://alias.br">alias.br</a> branch：则git branch可用git br代替</li>
</ul>
</li>
</ol>
<p>也可以自定义其他命令的别名，主要合理且方便操作即可。</p>
<h3 id="秘钥配置">秘钥配置</h3>
<ul>
<li>mac终端查看是否已经存在SSH密钥：cd ~/.ssh，如果没有密钥则不会有此文件夹。</li>
<li>生成新的秘钥, 命令如下<br>
ssh-keygen -t rsa -C “eamil”<br>
你需要把邮件地址换成你自己的邮件地址，然后一路回车，使用默认值即可，因为这个Key仅用于简单的服务，所以也无需设置密码。完成后会有如下显示Enter passphrase (empty for no passphrase):<br>
Enter same passphrase again:<br>
Your identification has been saved in /Users/gybguohao/.ssh/id_rsa。<br>
Your public key has been saved in /Users/gybguohao/.ssh/id_rsa.pub。<br>
The key fingerprint is:<br>
SHA256:5V6ZCQNS/3bVdl0GjGgQpWMFLazxTslnKbW2B1mbC+E eamil如果服务器端需要公钥, 直接复制.ssh目录下的id_rsa.pub内容即可。</li>
</ul>
<h3 id="gitignore">gitignore</h3>
<p>.gitignore文件的作用是忽略那些没必要的提交，比如系统环境或程序运行时产生的文件。GitHub为我们提供了各个语言的gitignore合集<a target="_blank" rel="noopener" href="https://links.jianshu.com/go?to=https%3A%2F%2Fgithub.com%2Fgithub%2Fgitignore">github/gitignore</a>，其中也包括<a target="_blank" rel="noopener" href="https://links.jianshu.com/go?to=https%3A%2F%2Fgithub.com%2Fgithub%2Fgitignore%2Fblob%2Fmaster%2FAndroid.gitignore">Android.gitignore</a>。</p>
<h3 id="将本地新建的项目提交到远程仓库的步骤">将本地新建的项目提交到远程仓库的步骤</h3>
<ul>
<li>初始化本地仓库git init</li>
<li>将本地内容添加至git本地暂存区中git add .</li>
<li>将暂存区添加至本地仓库中git commit -m “first commit”</li>
<li>添加远程仓库路径git remote add origin <a target="_blank" rel="noopener" href="https://github.com/gybguohao/test.git">https://github.com/gybguohao/test.git</a></li>
<li>将本地内容push至远程仓库中git push -u origin master</li>
</ul>
<h2 id="常用命令">常用命令</h2>
<h3 id="git-add">git add</h3>
<p>git add命令的作用是将文件从工作目录添加至暂存区</p>
<ol>
<li>把所有修改的信息添加到暂存区：git add .</li>
<li>把所有跟踪文件中被修改过或已删除的文件信息添加至暂存区：git add -u或git add --update，它不会处理那些没有被跟踪的文件</li>
<li>把所有跟踪文件中被修改过或已删除文件和所有未跟踪的文件信息添加到暂存区：git add -A或git add --all</li>
</ol>
<p>注意：git add .和git add -A在2.x版本中提交类型方面功能相同，但会因为所在目录不同产生差异：</p>
<ul>
<li>git add .只会提交当前目录或者子目录下相应文件。</li>
<li>git add -A无论在哪个目录执行都会提交相应文件。</li>
</ul>
<p>已经被提交到暂存区的文件，可以通过命令git reset HEAD – fileName撤销提交。或者使用git reset HEAD撤销此次提交。</p>
<h3 id="git-am">git am</h3>
<h3 id="git-branch">git branch</h3>
<p>git branch命令的作用主要是做分支管理操作。</p>
<ol>
<li>查看本地分支：git branch</li>
<li>查看本地和远程分支：git branch -a</li>
<li>新建名字为test的分支：git branch test</li>
<li>将test分支名字改为dev：git branch -m test dev</li>
<li>删除名字为dev的分支：git branch -d dev</li>
</ol>
<p>以上命令都是针对本地仓库操作，不影响远程仓库。</p>
<h3 id="git-checkout">git checkout</h3>
<p>git checkout命令最常用的情形是创建和切换分支以及撤销工作区的修改。</p>
<ol>
<li>切换到tag为v1.0.0时对应的代码：git checkout v1.0.0</li>
<li>在tag为v1.0.0的基础上创建分支名为test的分支：git checkout -b test v1.0.0。该命令相当于以下两条命令：
<ul>
<li>git branch test v1.0.0：在v1.0.0的基础上创建分支test</li>
<li>git checkout v1.0.0：切换到分支test</li>
</ul>
</li>
<li>撤销工作目录中文件的修改（文件有改动但还未git add）：git checkout – fileName，或者撤销所有修改使用git checkout .</li>
</ol>
<h3 id="git-commit">git commit</h3>
<p>git commit命令的作用是将暂存区的修改提交到本地仓库，同时会生成一个commmit id。</p>
<ol>
<li>将暂存区的修改提交到本地仓库：git commit -m “message”，&quot;message&quot;是本次提交的简述内容，比如添加新功能或修复bug等</li>
<li>将工作目录中修改后还未使用git add .命令添加到暂存区中的文件也提交到本地仓库：git commit –a –m “message”，该命令相当于以下两条命令：
<ul>
<li>git add .：把所有修改的信息添加到暂存区</li>
<li>git add -m “message”：将暂存区的修改提交到本地仓库</li>
</ul>
</li>
<li>修改最后一次提交（可用于漏掉某个文件的提交或重新编辑信息）：git commit --amend</li>
</ol>
<h3 id="git-fetch">git fetch</h3>
<p>git fetch命令的作用是将远程仓库上更新同步到本地仓库，并记录在.git/FETCH_HEAD中</p>
<ol>
<li>同步远程仓库上所有分支的更新：git fetch origin</li>
<li>同步远程仓库上master分支的更新：git fetch origin master</li>
<li>在本地新建test分支，并将远程仓库上master分支代码下载到本地test分支：git fetch origin master:test</li>
</ol>
<h3 id="git-format-patch">git format-patch</h3>
<p>git format-patch命令的作用是将commit提交的代码修改以及描述信息保存在后缀名为.patch文件中，然后配合git am命令使用。</p>
<ol>
<li>生成最近n次commit的ptach：git format-patch -n</li>
<li>生成某个commit的patch：git format-patch -1 <commit-id></li>
<li>生成某个commit以来的所有patch：git format-patch <commit-id>，其中不包含该commit</li>
<li>生成某两个commit之间的patch：git format-patch <commit-id>…<commit-id>，其中不包含第一个commit，但包含第二个commit，即是开闭区间</li>
</ol>
<h3 id="git-init">git init</h3>
<p>git init命令的作用是在当前目录中初始化仓库，并且创建一个名为.git的子目录，该目录含有你初始化的git仓库中所有的必须文件。</p>
<h3 id="git-log">git log</h3>
<p>git log命令的作用是查看历史提交记录</p>
<ol>
<li>查看历史提交记录：git log</li>
<li>将每条历史提交记录展示成一行：git log --oneline，也可以使用git log --pretty=oneline</li>
<li>查看某个人的提交记录：git log --author=“name”</li>
<li>显示ASCII图形表示的分支合并历史：git log --graph</li>
<li>显示前n条记录：git log -n</li>
<li>显示某个日期之后的记录：git log --after=“2018-10-1”，包含2018年10月1号的记录</li>
<li>显示某个日期之前的记录：git log --after=&quot;2018-10-1，包含2018年10月1号的记录</li>
<li>显示某两个日期之间的记录：git log --after=“2018-10-1” --before=“2018-10-7”</li>
</ol>
<h3 id="git-merge">git merge</h3>
<p>git merge命令的作用主要是分支的合并。</p>
<ol>
<li>如果当前是master分支，需要合并dev分支：git merge dev</li>
</ol>
<h3 id="git-pull">git pull</h3>
<p>git pull命令的作用是获取远程仓库的更新，再与本地分支合并。git pull &lt;远程仓库名&gt; &lt;远程分支名&gt;:&lt;本地分支名&gt;</p>
<ol>
<li>取回远程仓库上的dev分支与本地的master分支合并：git pull origin dev:master</li>
<li>取回远程仓库上的dev分支与当前分支合并：git pull origin dev，该命令相当于以下两条命令：
<ul>
<li>git fetch origin dev：获取远程仓库上dev分支的更新</li>
<li>git merge origin/dev：当前分支合并dev分支</li>
</ul>
</li>
</ol>
<p>注意：通过git fetch所取回的更新，在本地仓库上需要用“远程仓库名/分支名”的形式读取，比如origin仓库的master分支，就需要用origin/master来读取。</p>
<h3 id="git-push">git push</h3>
<p>git push命令的作用是将本地仓库的更新推送到远程仓库上。git push &lt;远程仓库名&gt; &lt;本地分支名&gt;:&lt;远程分支名&gt;</p>
<ol>
<li>将本地仓库master分支的更新推送到远程仓库上：git push origin master，也可以直接使用git push origin，会将本地分支推送到与之存在追踪关系的远程分支。</li>
<li>删除远程dev分支：git push origin --delete dev</li>
</ol>
<h3 id="git-remote">git remote</h3>
<p>git remote命令的作用主要是管理远程仓库。</p>
<ol>
<li>查看关联的远程仓库的名称：git remote</li>
<li>查看关联的远程仓库的详细信息：git remote -v</li>
<li>添加远程仓库的关联：git remote add origin &lt;远程仓库地址&gt;</li>
<li>删除远程仓库的关联：git remote remove &lt;远程仓库名称&gt;</li>
<li>修改远程仓库的关联：git remote set-url origin &lt;新的远程仓库地址&gt;</li>
<li>更新远程仓库的分支：git remote update origin --prune</li>
</ol>
<h3 id="git-reset">git reset</h3>
<p>git reset命令的作用是撤销暂存区的修改或本地仓库的提交。</p>
<ol>
<li>撤销已经提交到暂存区的文件（已经git add但还未git commit）:
<ul>
<li>撤销已经提交到暂存区的文件：git reset HEAD fileName或git reset --mixed HEAD fileName</li>
<li>撤销所有提交：git reset HEAD .或git reset --mixed HEAD .</li>
</ul>
</li>
<li>对已经提交到本地仓库做撤销（已经git commit但还未git push）：
<ul>
<li>将头指针恢复，已经提交到暂存区以及工作区的内容都不变：git reset --soft commit-id或git reset --soft HEAD~1</li>
<li>将头指针恢复并且撤销暂存区的提交，但是工作区的内容不变：git reset --mixed commit-id或git reset --mixed HEAD~1</li>
<li>将所有内容恢复到指定版本：git reset --hard commit-id或git reset --hard HEAD~1</li>
</ul>
</li>
</ol>
<p>注意：commit id可通过git log查看（取前六位即可），HEAD~1表示前一次提交（可以此类推）。</p>
<h3 id="git-revert">git revert</h3>
<h3 id="git-stash">git stash</h3>
<p>git stash命令的作用是保存当前分支工作目录所做的修改。即如果当前分支所做的修改你还不想提交，但又需要切换到其他分支去查看，就可以使用该命令。</p>
<ol>
<li>保存当前进度：git stash</li>
<li>查看已经保存的历史进度记录：git stash list</li>
<li>重新应用某个已经保存的进度，并且删除进度记录：git stash pop &lt;历史进度id&gt;，</li>
<li>重新应用某个已经保存的进度，但不删除进度记录：git stash apply &lt;历史进度id&gt;，如果直接使用git stash默认是使用最近的保存</li>
<li>删除某个历史进度：git stash drop &lt;历史进度id&gt;</li>
<li>删除所有的历史进度：git stash clear</li>
</ol>
<h3 id="git-status">git status</h3>
<p>git status命令的作用是显示文件状态，红色表示工作目录的文件被修改但还没有提交到暂存区，绿色表示已经提交到暂存区。</p>
<ol>
<li>以极简的方式显示文件状态：git status -s
<ul>
<li>A：本地新增的文件（服务器上没有）</li>
<li>C：文件的一个新拷贝</li>
<li>D：本地删除的文件（服务器上还在）</li>
<li>M：红色为修改过未被添加进暂存区的，绿色为已经添加进暂存区的</li>
<li>R：文件名被修改</li>
<li>T：文件的类型被修改</li>
<li>U：文件没有被合并(你需要完成合并才能进行提交)</li>
<li>X：未知状态(很可能是遇到git的bug了，你可以向git提交bug report)</li>
<li>?：未被git进行管理，可以使用git add fileName把文件添加进来进行管理</li>
</ul>
</li>
</ol>
<p>已经被修改但还没提交到暂存区的文件，可以通过命令git checkout – fileName撤销更改。</p>
<h3 id="git-tag">git tag</h3>
<p>git tag命令主要是对项目标签进行管理。</p>
<ol>
<li>查看已有的标签历史记录：git tag</li>
<li>给当前最新的commit打上标签：git tag &lt;标签的定义&gt;</li>
<li>给对应的commit id打上标签：git tag &lt;标签定义&gt; <commit id></li>
</ol>
<h3 id="git-rm">git rm</h3>
<p>git rm 文件 //本地中该文件会被删除<br>
git rm -r 文件夹<br>
注意: 上面的方法会把对应的本地文件也删除掉，如果不想把本地文件删除，只把缓存区中的对应部分删除，则加上<code>--cached</code><br>
git rm --cached 文件 //本地中该文件不会被删除<br>
git rm -r --cached 文件夹 //删除文件夹</p>
<h2 id="Github上传大文件">Github上传大文件</h2>
<p>首先下载git-lfs（<a target="_blank" rel="noopener" href="https://github.com/git-lfs/git-lfs%EF%BC%89%EF%BC%8C%E5%AE%89%E8%A3%85%E5%A5%BD%E5%90%8E%E8%BF%9B%E5%85%A5%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93%E7%9B%AE%E5%BD%95%EF%BC%8C%E6%89%A7%E8%A1%8C%E4%B8%8B%E9%9D%A2%E7%9A%84%E5%91%BD%E4%BB%A4%E3%80%82">https://github.com/git-lfs/git-lfs），安装好后进入本地仓库目录，执行下面的命令。</a></p>
<figure class="highlight cmd"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git lfs track &quot;file&quot;</span><br></pre></td></tr></table></figure>
<p><strong>file</strong>是需要上传的大文件。执行完命令后会发现目录下生成了一个&quot;<strong>.gitattributes</strong>&quot;文件，文件内记录了我们要上传文件的信息。只有先把&quot;.gitattributes&quot;传上去，才可以上传大文件。</p>
<figure class="highlight cmd"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">git add .gitattributes</span><br><span class="line">git commit -m &quot;submit file&quot;</span><br><span class="line">git push -u origin master</span><br></pre></td></tr></table></figure>
<p>上传完毕后，开始上传大文件。</p>
<figure class="highlight cmd"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">git add file</span><br><span class="line">git commit -m &quot;add file&quot;</span><br><span class="line">git push -u origin master</span><br></pre></td></tr></table></figure>
<p>出现下面的进度条，就说明文件正在上传中啦~</p>
<p><img src="https://imgs-1302910354.cos.ap-shanghai.myqcloud.com/images/image-20221025201937900.png" alt="image-20221025201937900"></p>
</article><div class="post-copyright"><div class="post-copyright__author"><span class="post-copyright-meta">文章作者: </span><span class="post-copyright-info"><a href="https://ismaxu.com">Ruoneo</a></span></div><div class="post-copyright__type"><span class="post-copyright-meta">文章链接: </span><span class="post-copyright-info"><a href="https://ismaxu.com/2021/06/10/Git%E5%B8%B8%E7%94%A8%E5%91%BD%E4%BB%A4/">https://ismaxu.com/2021/06/10/Git%E5%B8%B8%E7%94%A8%E5%91%BD%E4%BB%A4/</a></span></div><div class="post-copyright__notice"><span class="post-copyright-meta">版权声明: </span><span class="post-copyright-info">本博客所有文章除特别声明外，均采用 <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank">CC BY-NC-SA 4.0</a> 许可协议。转载请注明来自 <a href="https://ismaxu.com" target="_blank">水榭听泉</a>！</span></div></div><div class="tag_share"><div class="post-meta__tag-list"></div><div class="post_share"><div class="social-share" data-image="https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg" data-sites="facebook,twitter,wechat,weibo,qq"></div><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/butterfly-extsrc/sharejs/dist/css/share.min.css" media="print" onload="this.media='all'"><script src="https://cdn.jsdelivr.net/npm/butterfly-extsrc/sharejs/dist/js/social-share.min.js" defer></script></div></div><nav class="pagination-post" id="pagination"><div class="prev-post pull-left"><a href="/2021/06/20/git%E5%B7%A5%E4%BD%9C%E5%8C%BA%E3%80%81%E6%9A%82%E5%AD%98%E5%8C%BA%E3%80%81%E7%89%88%E6%9C%AC%E5%BA%93%E6%A6%82%E5%BF%B5/"><img class="prev-cover" src="https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg" onerror="onerror=null;src='/img/404.jpg'" alt="cover of previous post"><div class="pagination-info"><div class="label">上一篇</div><div class="prev_info">git工作区、暂存区、版本库概念</div></div></a></div><div class="next-post pull-right"><a href="/2021/03/18/LaTex%E8%AF%AD%E6%B3%95/"><img class="next-cover" src="https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg" onerror="onerror=null;src='/img/404.jpg'" alt="cover of next post"><div class="pagination-info"><div class="label">下一篇</div><div class="next_info">LaTex语法</div></div></a></div></nav><hr/><div id="post-comment"><div class="comment-head"><div class="comment-headline"><i class="fas fa-comments fa-fw"></i><span> 评论</span></div><div id="comment-switch"><span class="first-comment">Twikoo</span><span class="switch-btn"></span><span class="second-comment">Gitalk</span></div></div><div class="comment-wrap"><div><div id="twikoo-wrap"></div></div><div><div id="gitalk-container"></div></div></div></div></div><div class="aside-content" id="aside-content"><div class="card-widget card-info"><div class="is-center"><div class="avatar-img"><img src="/img/avatar.jpg" onerror="this.onerror=null;this.src='/img/friend_404.gif'" alt="avatar"/></div><div class="author-info__name">Ruoneo</div><div class="author-info__description">嗨! 你好!</div></div><div class="card-info-data site-data is-center"><a href="/archives/"><div class="headline">文章</div><div class="length-num">64</div></a><a href="/tags/"><div class="headline">标签</div><div class="length-num">26</div></a><a href="/categories/"><div class="headline">分类</div><div class="length-num">4</div></a></div><div class="card-info-social-icons is-center"><a class="social-icon" href="https://github.com/ruoneo" target="_blank" title="Github"><i class="fab fa-github"></i></a><a class="social-icon" href="mailto:xum321@gmail.com" target="_blank" title="Email"><i class="fas fa-envelope"></i></a></div></div><div class="card-widget card-announcement"><div class="item-headline"><i class="fas fa-bullhorn fa-shake"></i><span>公告</span></div><div class="announcement_content">感谢来访。希望这里有对你有帮助的内容。</div></div><div class="sticky_layout"><div class="card-widget" id="card-toc"><div class="item-headline"><i class="fas fa-stream"></i><span>目录</span><span class="toc-percentage"></span></div><div class="toc-content"><ol class="toc"><li class="toc-item toc-level-2"><a class="toc-link" href="#Git%E5%B8%B8%E7%94%A8%E5%91%BD%E4%BB%A4-md-fig-0-png"><span class="toc-text"></span></a></li><li class="toc-item toc-level-2"><a class="toc-link" href="#%E7%AE%80%E4%BB%8B"><span class="toc-text">简介</span></a></li><li class="toc-item toc-level-2"><a class="toc-link" href="#%E9%85%8D%E7%BD%AE"><span class="toc-text">配置</span></a><ol class="toc-child"><li class="toc-item toc-level-3"><a class="toc-link" href="#git-config"><span class="toc-text">git config</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#%E7%A7%98%E9%92%A5%E9%85%8D%E7%BD%AE"><span class="toc-text">秘钥配置</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#gitignore"><span class="toc-text">gitignore</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#%E5%B0%86%E6%9C%AC%E5%9C%B0%E6%96%B0%E5%BB%BA%E7%9A%84%E9%A1%B9%E7%9B%AE%E6%8F%90%E4%BA%A4%E5%88%B0%E8%BF%9C%E7%A8%8B%E4%BB%93%E5%BA%93%E7%9A%84%E6%AD%A5%E9%AA%A4"><span class="toc-text">将本地新建的项目提交到远程仓库的步骤</span></a></li></ol></li><li class="toc-item toc-level-2"><a class="toc-link" href="#%E5%B8%B8%E7%94%A8%E5%91%BD%E4%BB%A4"><span class="toc-text">常用命令</span></a><ol class="toc-child"><li class="toc-item toc-level-3"><a class="toc-link" href="#git-add"><span class="toc-text">git add</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-am"><span class="toc-text">git am</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-branch"><span class="toc-text">git branch</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-checkout"><span class="toc-text">git checkout</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-commit"><span class="toc-text">git commit</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-fetch"><span class="toc-text">git fetch</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-format-patch"><span class="toc-text">git format-patch</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-init"><span class="toc-text">git init</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-log"><span class="toc-text">git log</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-merge"><span class="toc-text">git merge</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-pull"><span class="toc-text">git pull</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-push"><span class="toc-text">git push</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-remote"><span class="toc-text">git remote</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-reset"><span class="toc-text">git reset</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-revert"><span class="toc-text">git revert</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-stash"><span class="toc-text">git stash</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-status"><span class="toc-text">git status</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-tag"><span class="toc-text">git tag</span></a></li><li class="toc-item toc-level-3"><a class="toc-link" href="#git-rm"><span class="toc-text">git rm</span></a></li></ol></li><li class="toc-item toc-level-2"><a class="toc-link" href="#Github%E4%B8%8A%E4%BC%A0%E5%A4%A7%E6%96%87%E4%BB%B6"><span class="toc-text">Github上传大文件</span></a></li></ol></div></div><div class="card-widget card-recent-post"><div class="item-headline"><i class="fas fa-history"></i><span>最新文章</span></div><div class="aside-list"><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2024/07/06/git%E5%B1%80%E5%9F%9F%E7%BD%91%E9%83%A8%E7%BD%B2%E6%96%B9%E6%B3%95/" title="git局域网部署方法">git局域网部署方法</a><time datetime="2024-07-06T08:13:10.000Z" title="发表于 2024-07-06 16:13:10">2024-07-06</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2023/09/25/%E5%85%B3%E4%BA%8EPyQt%E7%9A%84connect%E4%BC%A0%E5%85%A5lambda%E5%87%BD%E6%95%B0%E4%BD%9C%E4%B8%BA%E5%8F%82%E6%95%B0%E8%B0%83%E7%94%A8%E6%A7%BD%E5%87%BD%E6%95%B0%E7%9A%84%E4%B8%80%E7%82%B9%E6%80%9D%E8%80%83/" title="关于PyQt的connect传入lambda函数作为参数调用槽函数的一点思考">关于PyQt的connect传入lambda函数作为参数调用槽函数的一点思考</a><time datetime="2023-09-25T13:53:35.000Z" title="发表于 2023-09-25 21:53:35">2023-09-25</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2022/03/30/%E5%A4%8D%E4%B9%A05/" title="Spring注解">Spring注解</a><time datetime="2022-03-30T07:22:16.000Z" title="发表于 2022-03-30 15:22:16">2022-03-30</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2022/03/30/%E5%A4%8D%E4%B9%A04/" title="Spring">Spring</a><time datetime="2022-03-30T02:23:10.000Z" title="发表于 2022-03-30 10:23:10">2022-03-30</time></div></div><div class="aside-list-item no-cover"><div class="content"><a class="title" href="/2022/03/22/MultiDTI_%20drug%E2%80%93target%20interaction%20prediction%20based%20on%20multi-modal%20representation%20learning%20to%20bridge%20the%20gap%20between%20new%20chemical/" title="MultiDTI_ drug–target interaction prediction based on multi-modal representation learning to bridge the gap between new chemical">MultiDTI_ drug–target interaction prediction based on multi-modal representation learning to bridge the gap between new chemical</a><time datetime="2022-03-22T06:29:57.000Z" title="发表于 2022-03-22 14:29:57">2022-03-22</time></div></div></div></div></div></div></main><footer id="footer" style="background: color(orange)"><div id="footer-wrap"><div class="copyright">&copy;2024 By Ruoneo</div><div class="footer_custom_text"><div><a target="_blank" rel="noopener" href="https://beian.miit.gov.cn"><img class="icp-icon"><span>豫ICP备 2022020326号</span></a>&nbsp|&nbsp<a target="_blank" rel="noopener" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=41020202000143"><span>豫公网安备 41020202000143号</span></a></div></div></div></footer></div><div id="rightside"><div id="rightside-config-hide"><button id="readmode" type="button" title="阅读模式"><i class="fas fa-book-open"></i></button><button id="darkmode" type="button" title="浅色和深色模式转换"><i class="fas fa-adjust"></i></button><button id="hide-aside-btn" type="button" title="单栏和双栏切换"><i class="fas fa-arrows-alt-h"></i></button></div><div id="rightside-config-show"><button id="rightside_config" type="button" title="设置"><i class="fas fa-cog fa-spin"></i></button><button class="close" id="mobile-toc-button" type="button" title="目录"><i class="fas fa-list-ul"></i></button><a id="to_comment" href="#post-comment" title="直达评论"><i class="fas fa-comments"></i></a><button id="go-up" type="button" title="回到顶部"><i class="fas fa-arrow-up"></i></button></div></div><div id="local-search"><div class="search-dialog"><nav class="search-nav"><span class="search-dialog-title">搜索</span><span id="loading-status"></span><button class="search-close-button"><i class="fas fa-times"></i></button></nav><div class="is-center" id="loading-database"><i class="fas fa-spinner fa-pulse"></i><span> 数据库加载中</span></div><div class="search-wrap"><div id="local-search-input"><div class="local-search-box"><input class="local-search-box--input" placeholder="搜索文章" type="text"/></div></div><hr/><div id="local-search-results"></div></div></div><div id="search-mask"></div></div><div><script src="/js/utils.js"></script><script src="/js/main.js"></script><script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox.umd.min.js"></script><script src="https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js"></script><script src="/js/search/local-search.js"></script><div class="js-pjax"><link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/katex/dist/katex.min.css"><script src="https://cdn.jsdelivr.net/npm/katex/dist/contrib/copy-tex.min.js"></script><script>(() => {
document.querySelectorAll('#article-container span.katex-display').forEach(item => {
btf.wrap(item, 'div', { class: 'katex-wrap'})
})
})()</script><script>(()=>{
const init = () => {
twikoo.init(Object.assign({
el: '#twikoo-wrap',
envId: 'https://tk.ismaxu.com',
region: '',
onCommentLoaded: function () {
btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
}
}, null))
}
const getCount = () => {
const countELement = document.getElementById('twikoo-count')
if(!countELement) return
twikoo.getCommentsCount({
envId: 'https://tk.ismaxu.com',
region: '',
urls: [window.location.pathname],
includeReply: false
}).then(function (res) {
countELement.innerText = res[0].count
}).catch(function (err) {
console.error(err);
});
}
const runFn = () => {
init()
}
const loadTwikoo = () => {
if (typeof twikoo === 'object') {
setTimeout(runFn,0)
return
}
getScript('https://cdn.jsdelivr.net/npm/twikoo/dist/twikoo.all.min.js').then(runFn)
}
if ('Twikoo' === 'Twikoo' || !false) {
if (false) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
else loadTwikoo()
} else {
window.loadOtherComment = () => {
loadTwikoo()
}
}
})()</script><script>function addGitalkSource () {
const ele = document.createElement('link')
ele.rel = 'stylesheet'
ele.href= 'https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.css'
document.getElementsByTagName('head')[0].appendChild(ele)
}
function loadGitalk () {
function initGitalk () {
var gitalk = new Gitalk(Object.assign({
clientID: 'f9bab17720653ab07b39',
clientSecret: 'e77fbcac5c4043ddf8d845aee7d6d5f118f607e2',
repo: 'ruoneo-comment-repo',
owner: 'ruoneo',
admin: ['ruoneo'],
id: 'c7e160e79aa1faec23a7fb9813e31122',
updateCountCallback: commentCount
},null))
gitalk.render('gitalk-container')
}
if (typeof Gitalk === 'function') initGitalk()
else {
addGitalkSource()
getScript('https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.js').then(initGitalk)
}
}
function commentCount(n){
let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
if (isCommentCount) {
isCommentCount.innerHTML= n
}
}
if ('Twikoo' === 'Gitalk' || !false) {
if (false) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
else loadGitalk()
} else {
function loadOtherComment () {
loadGitalk()
}
}</script></div></div></body></html>