"use strict"; const {Fragment: _Fragment, jsx: _jsx, jsxs: _jsxs} = arguments[0]; const {useMDXComponents: _provideComponents} = arguments[0]; function _createMdxContent(props) { const _components = { a: "a", blockquote: "blockquote", code: "code", em: "em", h2: "h2", h3: "h3", h4: "h4", img: "img", li: "li", p: "p", path: "path", pre: "pre", span: "span", strong: "strong", svg: "svg", ul: "ul", ..._provideComponents(), ...props.components }; return _jsxs(_Fragment, { children: [_jsx(_components.p, { children: "国外网友制作了一张 Git Cheat Sheet，总结很精炼，各位不妨收藏一下。" }), "\n", _jsx(_components.p, { children: "本节选择性介绍 git 中比较常用的命令行场景。" }), "\n", _jsx(_components.img, { src: "https://raw.githubusercontent.com/dunwu/images/master/cs/web/git/git-cheat-sheet.png", alt: "img", className: "internal" }), "\n", _jsxs(_components.h2, { id: "安装", children: [_jsx(_components.a, { className: "heading-link", href: "#安装", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "安装"] }), "\n", _jsx(_components.p, { children: _jsx(_components.strong, { children: "（1）Debian/Ubuntu 环境安装" }) }), "\n", _jsx(_components.p, { children: "如果你使用的系统是 Debian/Ubuntu ，安装命令为：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "apt-get" }), " ", _jsx(_components.span, { className: "token function", children: "install" }), " libcurl4-gnutls-dev libexpat1-dev gettext ", _jsx(_components.span, { className: "token punctuation", children: "\\" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token operator", children: ">" }), " libz-dev libssl-dev\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "apt-get" }), " ", _jsx(_components.span, { className: "token function", children: "install" }), " git-core\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--version" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " version ", _jsx(_components.span, { className: "token number", children: "1.8" }), ".1.2\n"] })] }) }), "\n", _jsx(_components.p, { children: _jsx(_components.strong, { children: "（2）Centos/RedHat 环境安装" }) }), "\n", _jsx(_components.p, { children: "如果你使用的系统是 Centos/RedHat ，安装命令为：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: ["$ yum ", _jsx(_components.span, { className: "token function", children: "install" }), " curl-devel expat-devel gettext-devel ", _jsx(_components.span, { className: "token punctuation", children: "\\" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token operator", children: ">" }), " openssl-devel zlib-devel\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ yum ", _jsx(_components.span, { className: "token parameter variable", children: "-y" }), " ", _jsx(_components.span, { className: "token function", children: "install" }), " git-core\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--version" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " version ", _jsx(_components.span, { className: "token number", children: "1.7" }), ".1\n"] })] }) }), "\n", _jsx(_components.p, { children: _jsx(_components.strong, { children: "（3）Windows 环境安装" }) }), "\n", _jsxs(_components.p, { children: ["在", _jsx(_components.a, { href: "https://git-scm.com/downloads", target: "_blank", rel: "noopener noreferrer", children: "Git 官方下载地址" }), "下载 exe 安装包。按照安装向导安装即可。"] }), "\n", _jsx(_components.p, { children: "建议安装 Git Bash 这个 git 的命令行工具。" }), "\n", _jsx(_components.p, { children: _jsx(_components.strong, { children: "（4）Mac 环境安装" }) }), "\n", _jsxs(_components.p, { children: ["在", _jsx(_components.a, { href: "https://git-scm.com/downloads", target: "_blank", rel: "noopener noreferrer", children: "Git 官方下载地址" }), "下载 mac 安装包。按照安装向导安装即可。"] }), "\n", _jsxs(_components.h2, { id: "配置", children: [_jsx(_components.a, { className: "heading-link", href: "#配置", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "配置"] }), "\n", _jsxs(_components.p, { children: ["Git 自带一个 ", _jsx(_components.code, { className: "language-auto", children: "git config" }), " 的工具来帮助设置控制 Git 外观和行为的配置变量。这些变量存储在三个不同的位置："] }), "\n", _jsxs(_components.ul, { children: ["\n", _jsxs(_components.li, { children: [_jsx(_components.code, { className: "language-auto", children: "/etc/gitconfig" }), " 文件: 包含系统上每一个用户及他们仓库的通用配置。如果使用带有 ", _jsx(_components.code, { className: "language-auto", children: "--system" }), " 选项的 ", _jsx(_components.code, { className: "language-auto", children: "git config" }), " 时，它会从此文件读写配置变量。"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.code, { className: "language-auto", children: "~/.gitconfig" }), " 或 ", _jsx(_components.code, { className: "language-auto", children: "~/.config/git/config" }), " 文件：只针对当前用户。可以传递 ", _jsx(_components.code, { className: "language-auto", children: "--global" }), " 选项让 Git 读写此文件。"] }), "\n", _jsxs(_components.li, { children: ["当前使用仓库的 Git 目录中的 ", _jsx(_components.code, { className: "language-auto", children: "config" }), " 文件（就是 ", _jsx(_components.code, { className: "language-auto", children: ".git/config" }), "）：针对该仓库。"] }), "\n"] }), "\n", _jsxs(_components.p, { children: ["每一个级别覆盖上一级别的配置，所以 ", _jsx(_components.code, { className: "language-auto", children: ".git/config" }), " 的配置变量会覆盖 ", _jsx(_components.code, { className: "language-auto", children: "/etc/gitconfig" }), " 中的配置变量。"] }), "\n", _jsxs(_components.p, { children: ["在 Windows 系统中，Git 会查找 ", _jsx(_components.code, { className: "language-auto", children: "$HOME" }), " 目录下（一般情况下是 ", _jsx(_components.code, { className: "language-auto", children: "C:\\Users\\$USER" }), "）的 ", _jsx(_components.code, { className: "language-auto", children: ".gitconfig" }), " 文件。 Git 同样也会寻找 ", _jsx(_components.code, { className: "language-auto", children: "/etc/gitconfig" }), " 文件，但只限于 MSys 的根目录下，即安装 Git 时所选的目标位置。"] }), "\n", _jsxs(_components.h3, { id: "配置用户信息", children: [_jsx(_components.a, { className: "heading-link", href: "#配置用户信息", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "配置用户信息"] }), "\n", _jsx(_components.p, { children: "当安装完 Git 应该做的第一件事就是设置你的用户名称与邮件地址。这样做很重要，因为每一个 Git 的提交都会使用这些信息，并且它会写入到你的每一次提交中，不可更改：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " config ", _jsx(_components.span, { className: "token parameter variable", children: "--global" }), " user.name ", _jsx(_components.span, { className: "token string", children: "\"John Doe\"" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " config ", _jsx(_components.span, { className: "token parameter variable", children: "--global" }), " user.email johndoe@example.com\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["再次强调，如果使用了 ", _jsx(_components.code, { className: "language-auto", children: "--global" }), " 选项，那么该命令只需要运行一次，因为之后无论你在该系统上做任何事情， Git 都会使用那些信息。当你想针对特定项目使用不同的用户名称与邮件地址时，可以在那个项目目录下运行没有 ", _jsx(_components.code, { className: "language-auto", children: "--global" }), " 选项的命令来配置。"] }), "\n", _jsx(_components.p, { children: "很多 GUI 工具都会在第一次运行时帮助你配置这些信息。" }), "\n", _jsxs(_components.h3, { id: "给-git-命令添加别名", children: [_jsx(_components.a, { className: "heading-link", href: "#给-git-命令添加别名", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "给 Git 命令添加别名"] }), "\n", _jsxs(_components.p, { children: ["在 OS X 和 Linux 下, 你的 Git 的配置文件储存在 ", _jsx(_components.code, { className: "language-auto", children: "~/.gitconfig" }), "。我在", _jsx(_components.code, { className: "language-auto", children: "[alias]" }), " 部分添加了一些快捷别名(和一些我容易拼写错误的)，如下:"] }), "\n", _jsx(_components.pre, { className: "language-vim", children: _jsxs(_components.code, { className: "language-vim code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "[" }), "alias", _jsx(_components.span, { className: "token punctuation", children: "]" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [" a ", _jsx(_components.span, { className: "token operator", children: "=" }), " add\n"] }), _jsxs(_components.span, { className: "code-line", children: [" amend ", _jsx(_components.span, { className: "token operator", children: "=" }), " commit ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "amend\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token keyword", children: "c" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " commit\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token keyword", children: "ca" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " commit ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "amend\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token builtin", children: "ci" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " commit ", _jsx(_components.span, { className: "token operator", children: "-" }), "a\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token keyword", children: "co" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " checkout\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token keyword", children: "d" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " ", _jsx(_components.span, { className: "token builtin", children: "diff" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [" dc ", _jsx(_components.span, { className: "token operator", children: "=" }), " ", _jsx(_components.span, { className: "token builtin", children: "diff" }), " ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "changed\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token keyword", children: "ds" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " ", _jsx(_components.span, { className: "token builtin", children: "diff" }), " ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "staged\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token keyword", children: "f" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " fetch\n"] }), _jsxs(_components.span, { className: "code-line", children: [" loll ", _jsx(_components.span, { className: "token operator", children: "=" }), " log ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "graph ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "decorate ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "pretty", _jsx(_components.span, { className: "token operator", children: "=" }), "oneline ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "abbrev", _jsx(_components.span, { className: "token operator", children: "-" }), "commit\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token keyword", children: "m" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " merge\n"] }), _jsxs(_components.span, { className: "code-line", children: [" one ", _jsx(_components.span, { className: "token operator", children: "=" }), " log ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token operator", children: "-" }), "pretty", _jsx(_components.span, { className: "token operator", children: "=" }), "oneline\n"] }), _jsxs(_components.span, { className: "code-line", children: [" outstanding ", _jsx(_components.span, { className: "token operator", children: "=" }), " rebase ", _jsx(_components.span, { className: "token operator", children: "-" }), "i @", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token keyword", children: "u" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [" s ", _jsx(_components.span, { className: "token operator", children: "=" }), " status\n"] }), _jsxs(_components.span, { className: "code-line", children: [" unpushed ", _jsx(_components.span, { className: "token operator", children: "=" }), " log @", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token keyword", children: "u" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token builtin", children: "wc" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " whatchanged\n"] }), _jsxs(_components.span, { className: "code-line", children: [" wip ", _jsx(_components.span, { className: "token operator", children: "=" }), " rebase ", _jsx(_components.span, { className: "token operator", children: "-" }), "i @", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token keyword", children: "u" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [" zap ", _jsx(_components.span, { className: "token operator", children: "=" }), " fetch ", _jsx(_components.span, { className: "token operator", children: "-" }), _jsx(_components.span, { className: "token keyword", children: "p" }), "\n"] })] }) }), "\n", _jsxs(_components.h3, { id: "缓存一个仓库的用户名和密码", children: [_jsx(_components.a, { className: "heading-link", href: "#缓存一个仓库的用户名和密码", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "缓存一个仓库的用户名和密码"] }), "\n", _jsx(_components.p, { children: "你可能有一个仓库需要授权，这时你可以缓存用户名和密码，而不用每次推/拉(push/pull)的时候都输入，Credential helper 能帮你。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " config ", _jsx(_components.span, { className: "token parameter variable", children: "--global" }), " credential.helper cache\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Set git to use the credential memory cache" }), "\n"] })] }) }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " config ", _jsx(_components.span, { className: "token parameter variable", children: "--global" }), " credential.helper ", _jsx(_components.span, { className: "token string", children: "'cache --timeout=3600'" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Set the cache to timeout after 1 hour (setting is in seconds)" }), "\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "仓库", children: [_jsx(_components.a, { className: "heading-link", href: "#仓库", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "仓库"] }), "\n", _jsxs(_components.h3, { id: "初始化仓库", children: [_jsx(_components.a, { className: "heading-link", href: "#初始化仓库", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "初始化仓库"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " init\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "克隆仓库", children: [_jsx(_components.a, { className: "heading-link", href: "#克隆仓库", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "克隆仓库"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsxs(_components.code, { className: "language-bash code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 通过 SSH" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " clone ssh://user@domain.com/repo.git\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 通过 HTTP" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " clone http://domain.com/user/repo.git\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "储藏", children: [_jsx(_components.a, { className: "heading-link", href: "#储藏", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "储藏"] }), "\n", _jsxs(_components.p, { children: ["有时，我们需要在同一个项目的不同分支上工作。当需要切换分支时，偏偏本地的工作还没有完成，此时，提交修改显得不严谨，但是不提交代码又无法切换分支。这时，你可以使用 ", _jsx(_components.code, { className: "language-auto", children: "git stash" }), " 将本地的修改内容作为草稿储藏起来。"] }), "\n", _jsx(_components.p, { children: "官方称之为储藏，但我个人更喜欢称之为存草稿。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 1. 将修改作为当前分支的草稿保存" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 2. 查看草稿列表" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash list\n"] }), _jsxs(_components.span, { className: "code-line", children: ["stash@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "0" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": WIP on master: 6fae349 :memo: Writing docs.\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 3.1 删除草稿" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash drop stash@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "0" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 3.2 读取草稿" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash apply stash@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "0" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), "\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "暂存", children: [_jsx(_components.a, { className: "heading-link", href: "#暂存", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "暂存"] }), "\n", _jsxs(_components.p, { children: [_jsx(_components.code, { className: "language-auto", children: "git add" }), " 命令用于将修改添加到暂存区。"] }), "\n", _jsxs(_components.h3, { id: "暂存指定文件", children: [_jsx(_components.a, { className: "heading-link", href: "#暂存指定文件", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "暂存指定文件"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " xxx\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "暂存当前目录下所有修改", children: [_jsx(_components.a, { className: "heading-link", href: "#暂存当前目录下所有修改", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "暂存当前目录下所有修改"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token builtin class-name", children: "." }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "暂存所有修改", children: [_jsx(_components.a, { className: "heading-link", href: "#暂存所有修改", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "暂存所有修改"] }), "\n", _jsx(_components.pre, { children: _jsx(_components.code, { className: "language-auto code-highlight", children: _jsx(_components.span, { className: "code-line", children: "git add -A\n" }) }) }), "\n", _jsxs(_components.h3, { id: "暂存文件部分内容", children: [_jsx(_components.a, { className: "heading-link", href: "#暂存文件部分内容", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "暂存文件部分内容"] }), "\n", _jsx(_components.p, { children: "暂存文件部分内容" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--patch" }), " filename.x\n"] }) }) }), "\n", _jsxs(_components.p, { children: [_jsx(_components.code, { className: "language-auto", children: "-p" }), " 简写。这会打开交互模式，你将能够用 ", _jsx(_components.code, { className: "language-auto", children: "s" }), " 选项来分隔提交(commit)；"] }), "\n", _jsx(_components.p, { children: "然而, 如果这个文件是新的, 会没有这个选择，添加一个新文件时，这样做:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-N" }), " filename.x\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["然后, 你需要用 ", _jsx(_components.code, { className: "language-auto", children: "e" }), " 选项来手动选择需要添加的行，执行 ", _jsx(_components.code, { className: "language-auto", children: "git diff --cached" }), " 将会显示哪些行暂存了哪些行只是保存在本地了。"] }), "\n", _jsxs(_components.h3, { id: "把暂存的内容变成未暂存把未暂存的内容暂存起来", children: [_jsx(_components.a, { className: "heading-link", href: "#把暂存的内容变成未暂存把未暂存的内容暂存起来", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "把暂存的内容变成未暂存，把未暂存的内容暂存起来"] }), "\n", _jsx(_components.p, { children: "这个有点困难，我能想到的最好的方法是先 stash 未暂存的内容，然后重置(reset)，再 pop 第一步 stashed 的内容, 最后再 add 它们。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " stash ", _jsx(_components.span, { className: "token parameter variable", children: "-k" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " stash pop\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-A" }), "\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "提交", children: [_jsx(_components.a, { className: "heading-link", href: "#提交", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "提交"] }), "\n", _jsxs(_components.p, { children: [_jsx(_components.code, { className: "language-auto", children: "git commit" }), " 命令用于将修改保存到到本地仓库。"] }), "\n", _jsxs(_components.h3, { id: "查看最近一次提交", children: [_jsx(_components.a, { className: "heading-link", href: "#查看最近一次提交", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "查看最近一次提交"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " show\n"] }) }) }), "\n", _jsx(_components.p, { children: "或者" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " log ", _jsx(_components.span, { className: "token parameter variable", children: "-n1" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-p" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "提交本地的所有修改", children: [_jsx(_components.a, { className: "heading-link", href: "#提交本地的所有修改", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "提交本地的所有修改"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "-a" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "提交暂存的修改", children: [_jsx(_components.a, { className: "heading-link", href: "#提交暂存的修改", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "提交暂存的修改"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "把暂存的内容添加到上一次的提交", children: [_jsx(_components.a, { className: "heading-link", href: "#把暂存的内容添加到上一次的提交", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "把暂存的内容添加到上一次的提交"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "--amend" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "附加消息提交", children: [_jsx(_components.a, { className: "heading-link", href: "#附加消息提交", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "附加消息提交"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "-m" }), " ", _jsx(_components.span, { className: "token string", children: "'commit message'" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "修改提交信息", children: [_jsx(_components.a, { className: "heading-link", href: "#修改提交信息", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "修改提交信息"] }), "\n", _jsx(_components.p, { children: "如果你的提交信息写错了且这次提交（commit）还没有推送（push），可以使用以下命令修改：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "--amend" }), "\n"] }) }) }), "\n", _jsx(_components.p, { children: "或者" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "--amend" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-m" }), " ", _jsx(_components.span, { className: "token string", children: "'xxxxxxx'" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "修改提交信息中的用户名和邮箱", children: [_jsx(_components.a, { className: "heading-link", href: "#修改提交信息中的用户名和邮箱", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "修改提交信息中的用户名和邮箱"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "--amend" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--author" }), " ", _jsx(_components.span, { className: "token string", children: "\"New Authorname \"" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "从提交中移除一个文件", children: [_jsx(_components.a, { className: "heading-link", href: "#从提交中移除一个文件", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "从提交中移除一个文件"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " checkout HEAD^ myfile\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-A" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "--amend" }), "\n"] })] }) }), "\n", _jsxs(_components.h3, { id: "删除最后一次提交", children: [_jsx(_components.a, { className: "heading-link", href: "#删除最后一次提交", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "删除最后一次提交"] }), "\n", _jsx(_components.p, { children: "如果你需要删除推了的提交(pushed commits)，你可以使用下面的方法。可是，这会不可逆的改变你的历史，也会搞乱那些已经从该仓库拉取(pulled)了的人的历史。简而言之，如果你不是很确定，千万不要这么做。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " reset HEAD^ ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " push ", _jsx(_components.span, { className: "token parameter variable", children: "-f" }), " ", _jsx(_components.span, { className: "token punctuation", children: "[" }), "remote", _jsx(_components.span, { className: "token punctuation", children: "]" }), " ", _jsx(_components.span, { className: "token punctuation", children: "[" }), "branch", _jsx(_components.span, { className: "token punctuation", children: "]" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "如果你还没有推到远程, 把 Git 重置(reset)到你最后一次提交前的状态就可以了(同时保存暂存的变化):" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch*", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--soft" }), " HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "1" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" })] }) }), "\n", _jsxs(_components.p, { children: ["这只能在没有推送之前有用. 如果你已经推了, 唯一安全能做的是 ", _jsx(_components.code, { className: "language-auto", children: "git revert SHAofBadCommit" }), "，那会创建一个新的提交(commit)用于撤消前一个提交的所有变化(changes)；或者, 如果你推的这个分支是 rebase-safe 的 (例如：其它开发者不会从这个分支拉), 只需要使用 ", _jsx(_components.code, { className: "language-auto", children: "git push -f" }), "；更多, 请参考 ", _jsx(_components.a, { href: "#deleteremove-last-pushed-commit", children: "the above section" }), "。"] }), "\n", _jsxs(_components.h3, { id: "删除任意提交", children: [_jsx(_components.a, { className: "heading-link", href: "#删除任意提交", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "删除任意提交"] }), "\n", _jsx(_components.p, { children: "同样的警告：不到万不得已的时候不要这么做." }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token parameter variable", children: "--onto" }), " SHA1_OF_BAD_COMMIT^ SHA1_OF_BAD_COMMIT\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " push ", _jsx(_components.span, { className: "token parameter variable", children: "-f" }), " ", _jsx(_components.span, { className: "token punctuation", children: "[" }), "remote", _jsx(_components.span, { className: "token punctuation", children: "]" }), " ", _jsx(_components.span, { className: "token punctuation", children: "[" }), "branch", _jsx(_components.span, { className: "token punctuation", children: "]" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["或者做一个 ", _jsx(_components.a, { href: "#interactive-rebase", children: "交互式 rebase" }), " 删除那些你想要删除的提交(commit)里所对应的行。"] }), "\n", _jsxs(_components.h3, { id: "我尝试推一个修正后的提交amended-commit到远程但是报错", children: [_jsx(_components.a, { className: "heading-link", href: "#我尝试推一个修正后的提交amended-commit到远程但是报错", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我尝试推一个修正后的提交(amended commit)到远程，但是报错"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsx(_components.span, { className: "code-line", children: "To https://github.com/yourusername/repo.git\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token operator", children: "!" }), " ", _jsx(_components.span, { className: "token punctuation", children: "[" }), "rejected", _jsx(_components.span, { className: "token punctuation", children: "]" }), " mybranch -", _jsx(_components.span, { className: "token operator", children: ">" }), " mybranch ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "non-fast-forward", _jsx(_components.span, { className: "token punctuation", children: ")" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["error: failed to push some refs to ", _jsx(_components.span, { className: "token string", children: "'https://github.com/tanay1337/webmaker.org.git'" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "hint: Updates were rejected because the tip of your current branch is behind\n" }), _jsxs(_components.span, { className: "code-line", children: ["hint: its remote counterpart. Integrate the remote changes ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "e.g.\n"] }), _jsxs(_components.span, { className: "code-line", children: ["hint: ", _jsx(_components.span, { className: "token string", children: "'git pull ...'" }), _jsx(_components.span, { className: "token punctuation", children: ")" }), " before pushing again.\n"] }), _jsxs(_components.span, { className: "code-line", children: ["hint: See the ", _jsx(_components.span, { className: "token string", children: "'Note about fast-forwards'" }), " ", _jsx(_components.span, { className: "token keyword", children: "in" }), " ", _jsx(_components.span, { className: "token string", children: "'git push --help'" }), " ", _jsx(_components.span, { className: "token keyword", children: "for" }), " details.\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["注意, rebasing(见下面)和修正(amending)会用一个", _jsx(_components.strong, { children: "新的提交(commit)代替旧的" }), ", 所以如果之前你已经往远程仓库上推过一次修正前的提交(commit)，那你现在就必须强推(force push) (", _jsx(_components.code, { className: "language-auto", children: "-f" }), ")。注意 – ", _jsx(_components.em, { children: "总是" }), " 确保你指明一个分支!"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " push origin mybranch ", _jsx(_components.span, { className: "token parameter variable", children: "-f" }), "\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["一般来说, ", _jsx(_components.strong, { children: "要避免强推" }), ". 最好是创建和推(push)一个新的提交(commit)，而不是强推一个修正后的提交。后者会使那些与该分支或该分支的子分支工作的开发者，在源历史中产生冲突。"] }), "\n", _jsxs(_components.h3, { id: "不小心强制重置想找回内容", children: [_jsx(_components.a, { className: "heading-link", href: "#不小心强制重置想找回内容", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "不小心强制重置，想找回内容"] }), "\n", _jsxs(_components.p, { children: ["如果你意外的做了 ", _jsx(_components.code, { className: "language-auto", children: "git reset --hard" }), ", 你通常能找回你的提交(commit), 因为 Git 对每件事都会有日志，且都会保存几天。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reflog\n"] }) }) }), "\n", _jsx(_components.p, { children: "你将会看到一个你过去提交(commit)的列表, 和一个重置的提交。选择你想要回到的提交(commit)的 SHA，再重置一次:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " SHA1234\n"] }) }) }), "\n", _jsx(_components.p, { children: "这样就完成了。" }), "\n", _jsxs(_components.h2, { id: "重置", children: [_jsx(_components.a, { className: "heading-link", href: "#重置", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "重置"] }), "\n", _jsx(_components.p, { children: "撤销本地修改：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 移除缓存区的所有文件（i.e. 撤销上次git add）" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset HEAD\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 将HEAD重置到上一次提交的版本，并将之后的修改标记为未添加到缓存区的修改" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token operator", children: "<" }), "commit", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 将HEAD重置到上一次提交的版本，并保留未提交的本地修改" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--keep" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "commit", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 放弃工作目录下的所有修改" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " HEAD\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 将HEAD重置到指定的版本，并抛弃该版本之后的所有修改" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "commit-hash", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 用远端分支强制覆盖本地分支" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote/branch", _jsx(_components.span, { className: "token operator", children: ">" }), " e.g., upstream/master, origin/my-feature\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 放弃某个文件的所有本地修改" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout HEAD ", _jsx(_components.span, { className: "token operator", children: "<" }), "file", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["删除添加", _jsx(_components.code, { className: "language-auto", children: ".gitignore" }), "文件前错误提交的文件："] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 提交一条 git 记录，提交信息为 remove xyz file" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "rm" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-r" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--cached" }), " ", _jsx(_components.span, { className: "token builtin class-name", children: "." }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token builtin class-name", children: "." }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "-m" }), " ", _jsx(_components.span, { className: "token string", children: "\"remove xyz file\"" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "撤销远程修改（创建一个新的提交，并回滚到指定版本）：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# revert 哈希号为 commit-hash 的记录" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " revert ", _jsx(_components.span, { className: "token operator", children: "<" }), "commit-hash", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "彻底删除指定版本：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 执行下面命令后，commit-hash 提交后的记录都会被彻底删除，使用需谨慎" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "commit-hash", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " push ", _jsx(_components.span, { className: "token parameter variable", children: "-f" }), "\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "更新", children: [_jsx(_components.a, { className: "heading-link", href: "#更新", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "更新"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 下载远程端版本，但不合并到HEAD中" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " fetch ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 将远程端版本合并到本地版本中" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " pull origin master\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 以rebase方式将远端分支与本地合并" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " pull ", _jsx(_components.span, { className: "token parameter variable", children: "--rebase" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote", _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "推送", children: [_jsx(_components.a, { className: "heading-link", href: "#推送", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "推送"] }), "\n", _jsxs(_components.h3, { id: "推送提交到远程仓库", children: [_jsx(_components.a, { className: "heading-link", href: "#推送提交到远程仓库", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "推送提交到远程仓库"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " push remote ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote", _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "发布标签", children: [_jsx(_components.a, { className: "heading-link", href: "#发布标签", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "发布标签"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " push ", _jsx(_components.span, { className: "token parameter variable", children: "--tags" }), "\n"] }) }) }), "\n", _jsxs(_components.h2, { id: "未暂存", children: [_jsx(_components.a, { className: "heading-link", href: "#未暂存", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "未暂存"] }), "\n", _jsxs(_components.blockquote, { children: ["\n", _jsx(_components.p, { children: "未暂存(Unstaged)的内容" }), "\n"] }), "\n", _jsxs(_components.h3, { id: "把未暂存的内容移动到一个新分支", children: [_jsx(_components.a, { className: "heading-link", href: "#把未暂存的内容移动到一个新分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "把未暂存的内容移动到一个新分支"] }), "\n", _jsxs(_components.ul, { children: ["\n", _jsx(_components.li, { children: _jsx(_components.code, { className: "language-auto", children: "git checkout -b my-branch" }) }), "\n"] }), "\n", _jsxs(_components.h3, { id: "我想把未暂存的内容移动到另一个已存在的分支", children: [_jsx(_components.a, { className: "heading-link", href: "#我想把未暂存的内容移动到另一个已存在的分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想把未暂存的内容移动到另一个已存在的分支"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " stash\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " checkout my-branch\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " stash pop\n"] })] }) }), "\n", _jsxs(_components.h3, { id: "丢弃本地未提交的变化", children: [_jsx(_components.a, { className: "heading-link", href: "#丢弃本地未提交的变化", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "丢弃本地未提交的变化"] }), "\n", _jsx(_components.p, { children: "如果你只是想重置源(origin)和你本地(local)之间的一些提交(commit)，你可以：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## one commit" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " HEAD^\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## two commits" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " HEAD^^\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## four commits" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " HEAD~4\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## or" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "-f" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "重置某个特殊的文件, 你可以用文件名做为参数:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " reset filename\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我想丢弃某些未暂存的内容", children: [_jsx(_components.a, { className: "heading-link", href: "#我想丢弃某些未暂存的内容", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想丢弃某些未暂存的内容"] }), "\n", _jsx(_components.p, { children: "如果你想丢弃工作拷贝中的一部分内容，而不是全部。" }), "\n", _jsx(_components.p, { children: "签出(checkout)不需要的内容，保留需要的。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "-p" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Answer y to all of the snippets you want to drop" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["另外一个方法是使用 ", _jsx(_components.code, { className: "language-auto", children: "stash" }), "， Stash 所有要保留下的内容, 重置工作拷贝, 重新应用保留的部分。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash ", _jsx(_components.span, { className: "token parameter variable", children: "-p" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Select all of the snippets you want to save" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash pop\n"] })] }) }), "\n", _jsx(_components.p, { children: "或者, stash 你不需要的部分, 然后 stash drop。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash ", _jsx(_components.span, { className: "token parameter variable", children: "-p" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Select all of the snippets you don't want to save" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " stash drop\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "分支", children: [_jsx(_components.a, { className: "heading-link", href: "#分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "分支"] }), "\n", _jsxs(_components.blockquote, { children: ["\n", _jsx(_components.p, { children: "分支(Branches)" }), "\n"] }), "\n", _jsxs(_components.h3, { id: "列出所有的分支", children: [_jsx(_components.a, { className: "heading-link", href: "#列出所有的分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "列出所有的分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " branch\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "列出所有的远端分支", children: [_jsx(_components.a, { className: "heading-link", href: "#列出所有的远端分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "列出所有的远端分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " branch ", _jsx(_components.span, { className: "token parameter variable", children: "-r" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "基于当前分支创建新分支", children: [_jsx(_components.a, { className: "heading-link", href: "#基于当前分支创建新分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "基于当前分支创建新分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " branch ", _jsx(_components.span, { className: "token operator", children: "<" }), "new-branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "基于远程分支创建新分支", children: [_jsx(_components.a, { className: "heading-link", href: "#基于远程分支创建新分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "基于远程分支创建新分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " branch ", _jsx(_components.span, { className: "token parameter variable", children: "--track" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "new-branch", _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote-branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "删除本地分支", children: [_jsx(_components.a, { className: "heading-link", href: "#删除本地分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "删除本地分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " branch ", _jsx(_components.span, { className: "token parameter variable", children: "-d" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "强制删除本地分支", children: [_jsx(_components.a, { className: "heading-link", href: "#强制删除本地分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "强制删除本地分支"] }), "\n", _jsxs(_components.blockquote, { children: ["\n", _jsx(_components.p, { children: "注意：强制删除本地分支，将会丢失未合并的修改" }), "\n"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " branch ", _jsx(_components.span, { className: "token parameter variable", children: "-D" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "删除远程分支", children: [_jsx(_components.a, { className: "heading-link", href: "#删除远程分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "删除远程分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsxs(_components.code, { className: "language-bash code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " push ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote", _jsx(_components.span, { className: "token operator", children: ">" }), " :", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "since Git v1.5.0", _jsx(_components.span, { className: "token punctuation", children: ")" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " push ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote", _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--delete" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "since Git v1.7.0", _jsx(_components.span, { className: "token punctuation", children: ")" }), "\n"] })] }) }), "\n", _jsxs(_components.h3, { id: "切换分支", children: [_jsx(_components.a, { className: "heading-link", href: "#切换分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "切换分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "创建并切换到新分支", children: [_jsx(_components.a, { className: "heading-link", href: "#创建并切换到新分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "创建并切换到新分支"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "-b" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我从错误的分支拉取了内容或把内容拉取到了错误的分支", children: [_jsx(_components.a, { className: "heading-link", href: "#我从错误的分支拉取了内容或把内容拉取到了错误的分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我从错误的分支拉取了内容，或把内容拉取到了错误的分支"] }), "\n", _jsxs(_components.p, { children: ["这是另外一种使用 ", _jsx(_components.code, { className: "language-auto", children: "git reflog" }), " 情况，找到在这次错误拉(pull) 之前 HEAD 的指向。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reflog\n"] }), _jsxs(_components.span, { className: "code-line", children: ["ab7555f HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "0" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": pull origin wrong-branch: Fast-forward\n"] }), _jsxs(_components.span, { className: "code-line", children: ["c5bc55a HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "1" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": checkout: checkout message goes here\n"] })] }) }), "\n", _jsx(_components.p, { children: "重置分支到你所需的提交(desired commit):" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " c5bc55a\n"] }) }) }), "\n", _jsx(_components.p, { children: "完成。" }), "\n", _jsxs(_components.h3, { id: "我想扔掉本地的提交commit以便我的分支与远程的保持一致", children: [_jsx(_components.a, { className: "heading-link", href: "#我想扔掉本地的提交commit以便我的分支与远程的保持一致", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想扔掉本地的提交(commit)，以便我的分支与远程的保持一致"] }), "\n", _jsx(_components.p, { children: "先确认你没有推(push)你的内容到远程。" }), "\n", _jsxs(_components.p, { children: [_jsx(_components.code, { className: "language-auto", children: "git status" }), " 会显示你领先(ahead)源(origin)多少个提交:"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " status\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## On branch my-branch" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Your branch is ahead of 'origin/my-branch' by 2 commits." }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## (use \"git push\" to publish your local commits)" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "#" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "一种方法是:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " origin/my-branch\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我需要提交到一个新分支但错误的提交到了-master", children: [_jsx(_components.a, { className: "heading-link", href: "#我需要提交到一个新分支但错误的提交到了-master", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我需要提交到一个新分支，但错误的提交到了 master"] }), "\n", _jsx(_components.p, { children: "在 master 下创建一个新分支，不切换到新分支,仍在 master 下:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " branch my-branch\n"] }) }) }), "\n", _jsx(_components.p, { children: "把 master 分支重置到前一个提交:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " HEAD^\n"] }) }) }), "\n", _jsxs(_components.p, { children: [_jsx(_components.code, { className: "language-auto", children: "HEAD^" }), " 是 ", _jsx(_components.code, { className: "language-auto", children: "HEAD^1" }), " 的简写，你可以通过指定要设置的", _jsx(_components.code, { className: "language-auto", children: "HEAD" }), "来进一步重置。"] }), "\n", _jsxs(_components.p, { children: ["或者, 如果你不想使用 ", _jsx(_components.code, { className: "language-auto", children: "HEAD^" }), ", 找到你想重置到的提交(commit)的 hash(", _jsx(_components.code, { className: "language-auto", children: "git log" }), " 能够完成)，然后重置到这个 hash。使用", _jsx(_components.code, { className: "language-auto", children: "git push" }), " 同步内容到远程。"] }), "\n", _jsxs(_components.p, { children: ["例如, master 分支想重置到的提交的 hash 为", _jsx(_components.code, { className: "language-auto", children: "a13b85e" }), ":"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " a13b85e\n"] }), _jsx(_components.span, { className: "code-line", children: "HEAD is now at a13b85e\n" })] }) }), "\n", _jsx(_components.p, { children: "签出(checkout)刚才新建的分支继续工作:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout my-branch\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我想保留来自另外一个-ref-ish-的整个文件", children: [_jsx(_components.a, { className: "heading-link", href: "#我想保留来自另外一个-ref-ish-的整个文件", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想保留来自另外一个 ref-ish 的整个文件"] }), "\n", _jsx(_components.p, { children: "假设你正在做一个原型方案(原文为 working spike (see note)), 有成百的内容，每个都工作得很好。现在, 你提交到了一个分支，保存工作内容:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "solution", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-A" }), " ", _jsx(_components.span, { className: "token operator", children: "&&" }), " ", _jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "-m" }), " ", _jsx(_components.span, { className: "token string", children: "\"Adding all changes from this spike into one big commit.\"" }), "\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["当你想要把它放到一个分支里 (可能是", _jsx(_components.code, { className: "language-auto", children: "feature" }), ", 或者 ", _jsx(_components.code, { className: "language-auto", children: "develop" }), "), 你关心是保持整个文件的完整，你想要一个大的提交分隔成比较小。"] }), "\n", _jsx(_components.p, { children: "假设你有:" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsxs(_components.li, { children: ["分支 ", _jsx(_components.code, { className: "language-auto", children: "solution" }), ", 拥有原型方案，领先 ", _jsx(_components.code, { className: "language-auto", children: "develop" }), " 分支。"] }), "\n", _jsxs(_components.li, { children: ["分支 ", _jsx(_components.code, { className: "language-auto", children: "develop" }), ", 在这里你应用原型方案的一些内容。"] }), "\n"] }), "\n", _jsx(_components.p, { children: "我去可以通过把内容拿到你的分支里，来解决这个问题:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "develop", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout solution -- file1.txt\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["这会把这个文件内容从分支 ", _jsx(_components.code, { className: "language-auto", children: "solution" }), " 拿到分支 ", _jsx(_components.code, { className: "language-auto", children: "develop" }), " 里来:"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## On branch develop" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Your branch is up-to-date with 'origin/develop'." }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## Changes to be committed:" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## (use \"git reset HEAD ...\" to unstage)" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "#" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "## modified: file1.txt" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "然后, 正常提交。" }), "\n", _jsxs(_components.p, { children: ["Note: Spike solutions are made to analyze or solve the problem. These solutions are used for estimation and discarded once everyone gets clear visualization of the problem. ~ ", _jsx(_components.a, { href: "https://en.wikipedia.org/wiki/Extreme_programming_practices", target: "_blank", rel: "noopener noreferrer", children: "Wikipedia" }), "."] }), "\n", _jsxs(_components.h3, { id: "我把几个提交commit提交到了同一个分支而这些提交应该分布在不同的分支里", children: [_jsx(_components.a, { className: "heading-link", href: "#我把几个提交commit提交到了同一个分支而这些提交应该分布在不同的分支里", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我把几个提交(commit)提交到了同一个分支，而这些提交应该分布在不同的分支里"] }), "\n", _jsxs(_components.p, { children: ["假设你有一个", _jsx(_components.code, { className: "language-auto", children: "master" }), "分支，执行", _jsx(_components.code, { className: "language-auto", children: "git log" }), ", 你看到你做过两次提交:"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " log\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: "commit e3851e817c451cc36f2e6f3049db528415e3c114\n" }), _jsxs(_components.span, { className: "code-line", children: ["Author: Alex Lee ", _jsx(_components.span, { className: "token operator", children: "<" }), "alexlee@example.com", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Date: Tue Jul ", _jsx(_components.span, { className: "token number", children: "22" }), " ", _jsx(_components.span, { className: "token number", children: "15" }), ":39:27 ", _jsx(_components.span, { className: "token number", children: "2014" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-0400" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [" Bug ", _jsx(_components.span, { className: "token comment", children: "#21 - Added CSRF protection" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: "commit 5ea51731d150f7ddc4a365437931cd8be3bf3131\n" }), _jsxs(_components.span, { className: "code-line", children: ["Author: Alex Lee ", _jsx(_components.span, { className: "token operator", children: "<" }), "alexlee@example.com", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Date: Tue Jul ", _jsx(_components.span, { className: "token number", children: "22" }), " ", _jsx(_components.span, { className: "token number", children: "15" }), ":39:12 ", _jsx(_components.span, { className: "token number", children: "2014" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-0400" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [" Bug ", _jsx(_components.span, { className: "token comment", children: "#14 - Fixed spacing on title" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: "commit a13b85e984171c6e2a1729bb061994525f626d14\n" }), _jsxs(_components.span, { className: "code-line", children: ["Author: Aki Rose ", _jsx(_components.span, { className: "token operator", children: "<" }), "akirose@example.com", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Date: Tue Jul ", _jsx(_components.span, { className: "token number", children: "21" }), " 01:12:48 ", _jsx(_components.span, { className: "token number", children: "2014" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-0400" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: " First commit\n" })] }) }), "\n", _jsxs(_components.p, { children: ["让我们用提交 hash(commit hash)标记 bug (", _jsx(_components.code, { className: "language-auto", children: "e3851e8" }), " for #21, ", _jsx(_components.code, { className: "language-auto", children: "5ea5173" }), " for #14)."] }), "\n", _jsxs(_components.p, { children: ["首先, 我们把", _jsx(_components.code, { className: "language-auto", children: "master" }), "分支重置到正确的提交(", _jsx(_components.code, { className: "language-auto", children: "a13b85e" }), "):"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " a13b85e\n"] }), _jsx(_components.span, { className: "code-line", children: "HEAD is now at a13b85e\n" })] }) }), "\n", _jsx(_components.p, { children: "现在, 我们对 bug #21 创建一个新的分支:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "-b" }), " ", _jsx(_components.span, { className: "token number", children: "21" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), _jsx(_components.span, { className: "token number", children: "21" }), _jsx(_components.span, { className: "token punctuation", children: ")" }), "$\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["接着, 我们用 ", _jsx(_components.em, { children: "cherry-pick" }), " 把对 bug #21 的提交放入当前分支。这意味着我们将应用(apply)这个提交(commit)，仅仅这一个提交(commit)，直接在 HEAD 上面。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), _jsx(_components.span, { className: "token number", children: "21" }), _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " cherry-pick e3851e8\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["这时候, 这里可能会产生冲突，参见", _jsx(_components.a, { href: "#interactive-rebase", children: "交互式 rebasing 章" }), " ", _jsx(_components.a, { href: "#merge-conflict", children: _jsx(_components.strong, { children: "冲突节" }) }), " 解决冲突."] }), "\n", _jsxs(_components.p, { children: ["再者，我们为 bug #14 创建一个新的分支, 也基于", _jsx(_components.code, { className: "language-auto", children: "master" }), "分支"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), _jsx(_components.span, { className: "token number", children: "21" }), _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout master\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "-b" }), " ", _jsx(_components.span, { className: "token number", children: "14" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), _jsx(_components.span, { className: "token number", children: "14" }), _jsx(_components.span, { className: "token punctuation", children: ")" }), "$\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["最后, 为 bug #14 执行 ", _jsx(_components.code, { className: "language-auto", children: "cherry-pick" }), ":"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), _jsx(_components.span, { className: "token number", children: "14" }), _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " cherry-pick 5ea5173\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我想删除上游upstream分支被删除了的本地分支", children: [_jsx(_components.a, { className: "heading-link", href: "#我想删除上游upstream分支被删除了的本地分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想删除上游(upstream)分支被删除了的本地分支"] }), "\n", _jsx(_components.p, { children: "一旦你在 github 上面合并(merge)了一个 pull request, 你就可以删除你 fork 里被合并的分支。如果你不准备继续在这个分支里工作, 删除这个分支的本地拷贝会更干净，使你不会陷入工作分支和一堆陈旧分支的混乱之中。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " fetch ", _jsx(_components.span, { className: "token parameter variable", children: "-p" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我不小心删除了我的分支", children: [_jsx(_components.a, { className: "heading-link", href: "#我不小心删除了我的分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我不小心删除了我的分支"] }), "\n", _jsx(_components.p, { children: "如果你定期推送到远程, 多数情况下应该是安全的，但有些时候还是可能删除了还没有推到远程的分支。让我们先创建一个分支和一个新的文件:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "-b" }), " my-branch\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " branch\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "touch" }), " foo.txt\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "ls" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "README.md foo.txt\n" })] }) }), "\n", _jsx(_components.p, { children: "添加文件并做一次提交" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " ", _jsx(_components.span, { className: "token builtin class-name", children: "." }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "-m" }), " ", _jsx(_components.span, { className: "token string", children: "'foo.txt added'" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ foo.txt added\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token number", children: "1" }), " files changed, ", _jsx(_components.span, { className: "token number", children: "1" }), " insertions", _jsx(_components.span, { className: "token punctuation", children: "(" }), "+", _jsx(_components.span, { className: "token punctuation", children: ")" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [" create mode ", _jsx(_components.span, { className: "token number", children: "100644" }), " foo.txt\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " log\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: "commit 4e3cd85a670ced7cc17a2b5d8d3d809ac88d5012\n" }), _jsxs(_components.span, { className: "code-line", children: ["Author: siemiatj ", _jsx(_components.span, { className: "token operator", children: "<" }), "siemiatj@example.com", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Date: Wed Jul ", _jsx(_components.span, { className: "token number", children: "30" }), " 00:34:10 ", _jsx(_components.span, { className: "token number", children: "2014" }), " +0200\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: " foo.txt added\n" }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: "commit 69204cdf0acbab201619d95ad8295928e7f411d5\n" }), _jsxs(_components.span, { className: "code-line", children: ["Author: Kate Hudson ", _jsx(_components.span, { className: "token operator", children: "<" }), "katehudson@example.com", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Date: Tue Jul ", _jsx(_components.span, { className: "token number", children: "29" }), " ", _jsx(_components.span, { className: "token number", children: "13" }), ":14:46 ", _jsx(_components.span, { className: "token number", children: "2014" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "-0400" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [" Fixes ", _jsx(_components.span, { className: "token comment", children: "#6: Force pushing after amending commits" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["现在我们切回到主(master)分支，‘不小心的’删除", _jsx(_components.code, { className: "language-auto", children: "my-branch" }), "分支"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout master\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Switched to branch ", _jsx(_components.span, { className: "token string", children: "'master'" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Your branch is up-to-date with ", _jsx(_components.span, { className: "token string", children: "'origin/master'" }), _jsx(_components.span, { className: "token builtin class-name", children: "." }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " branch ", _jsx(_components.span, { className: "token parameter variable", children: "-D" }), " my-branch\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Deleted branch my-branch ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "was 4e3cd85", _jsx(_components.span, { className: "token punctuation", children: ")" }), ".\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token builtin class-name", children: "echo" }), " oh noes, deleted my branch", _jsx(_components.span, { className: "token operator", children: "!" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["oh noes, deleted my branch", _jsx(_components.span, { className: "token operator", children: "!" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["在这时候你应该想起了", _jsx(_components.code, { className: "language-auto", children: "reflog" }), ", 一个升级版的日志，它存储了仓库(repo)里面所有动作的历史。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reflog\n"] }), _jsxs(_components.span, { className: "code-line", children: ["69204cd HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "0" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": checkout: moving from my-branch to master\n"] }), _jsxs(_components.span, { className: "code-line", children: ["4e3cd85 HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "1" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": commit: foo.txt added\n"] }), _jsxs(_components.span, { className: "code-line", children: ["69204cd HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "2" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": checkout: moving from master to my-branch\n"] })] }) }), "\n", _jsx(_components.p, { children: "正如你所见，我们有一个来自删除分支的提交 hash(commit hash)，接下来看看是否能恢复删除了的分支。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "-b" }), " my-branch-help\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Switched to a new branch ", _jsx(_components.span, { className: "token string", children: "'my-branch-help'" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch-help", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " 4e3cd85\n"] }), _jsx(_components.span, { className: "code-line", children: "HEAD is now at 4e3cd85 foo.txt added\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch-help", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "ls" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "README.md foo.txt\n" })] }) }), "\n", _jsxs(_components.p, { children: ["看! 我们把删除的文件找回来了。 Git 的 ", _jsx(_components.code, { className: "language-auto", children: "reflog" }), " 在 rebasing 出错的时候也是同样有用的。"] }), "\n", _jsxs(_components.h3, { id: "我想删除一个分支", children: [_jsx(_components.a, { className: "heading-link", href: "#我想删除一个分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想删除一个分支"] }), "\n", _jsx(_components.p, { children: "删除一个远程分支:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " push origin ", _jsx(_components.span, { className: "token parameter variable", children: "--delete" }), " my-branch\n"] }) }) }), "\n", _jsx(_components.p, { children: "你也可以:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " push origin :my-branch\n"] }) }) }), "\n", _jsx(_components.p, { children: "删除一个本地分支:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " branch ", _jsx(_components.span, { className: "token parameter variable", children: "-D" }), " my-branch\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我想从别人正在工作的远程分支签出checkout一个分支", children: [_jsx(_components.a, { className: "heading-link", href: "#我想从别人正在工作的远程分支签出checkout一个分支", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想从别人正在工作的远程分支签出(checkout)一个分支"] }), "\n", _jsx(_components.p, { children: "首先, 从远程拉取(fetch) 所有分支:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " fetch ", _jsx(_components.span, { className: "token parameter variable", children: "--all" }), "\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["假设你想要从远程的", _jsx(_components.code, { className: "language-auto", children: "daves" }), "分支签出到本地的", _jsx(_components.code, { className: "language-auto", children: "daves" })] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout ", _jsx(_components.span, { className: "token parameter variable", children: "--track" }), " origin/daves\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Branch daves ", _jsx(_components.span, { className: "token builtin class-name", children: "set" }), " up to track remote branch daves from origin.\n"] }), _jsxs(_components.span, { className: "code-line", children: ["Switched to a new branch ", _jsx(_components.span, { className: "token string", children: "'daves'" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["(", _jsx(_components.code, { className: "language-auto", children: "--track" }), " 是 ", _jsx(_components.code, { className: "language-auto", children: "git checkout -b [branch] [remotename]/[branch]" }), " 的简写)"] }), "\n", _jsxs(_components.p, { children: ["这样就得到了一个", _jsx(_components.code, { className: "language-auto", children: "daves" }), "分支的本地拷贝, 任何推过(pushed)的更新，远程都能看到."] }), "\n", _jsxs(_components.h2, { id: "标签", children: [_jsx(_components.a, { className: "heading-link", href: "#标签", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "标签"] }), "\n", _jsxs(_components.h3, { id: "添加标签", children: [_jsx(_components.a, { className: "heading-link", href: "#添加标签", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "添加标签"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " tag ", _jsx(_components.span, { className: "token operator", children: "<" }), "tag-name", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "添加标签并附加消息", children: [_jsx(_components.a, { className: "heading-link", href: "#添加标签并附加消息", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "添加标签并附加消息"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " tag ", _jsx(_components.span, { className: "token parameter variable", children: "-a" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "tag-name", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "删除标签", children: [_jsx(_components.a, { className: "heading-link", href: "#删除标签", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "删除标签"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " tag ", _jsx(_components.span, { className: "token parameter variable", children: "-d" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "tag_name", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " push ", _jsx(_components.span, { className: "token operator", children: "<" }), "remote", _jsx(_components.span, { className: "token operator", children: ">" }), " :refs/tags/", _jsx(_components.span, { className: "token operator", children: "<" }), "tag_name", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] })] }) }), "\n", _jsxs(_components.h3, { id: "恢复已删除标签", children: [_jsx(_components.a, { className: "heading-link", href: "#恢复已删除标签", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "恢复已删除标签"] }), "\n", _jsx(_components.p, { children: "如果你想恢复一个已删除标签(tag), 可以按照下面的步骤: 首先, 需要找到无法访问的标签(unreachable tag):" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "fsck" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--unreachable" }), " ", _jsx(_components.span, { className: "token operator", children: "|" }), " ", _jsx(_components.span, { className: "token function", children: "grep" }), " tag\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["记下这个标签(tag)的 hash，然后用 Git 的 ", _jsx(_components.a, { href: "http://git-scm.com/docs/git-update-ref", target: "_blank", rel: "noopener noreferrer", children: "update-ref" }), ":"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " update-ref refs/tags/", _jsx(_components.span, { className: "token operator", children: "<" }), "tag_name", _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "hash", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsx(_components.p, { children: "这时你的标签(tag)应该已经恢复了。" }), "\n", _jsxs(_components.h2, { id: "rebase-和-merge", children: [_jsx(_components.a, { className: "heading-link", href: "#rebase-和-merge", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "Rebase 和 Merge"] }), "\n", _jsxs(_components.blockquote, { children: ["\n", _jsx(_components.p, { children: "merge 与 rebase 虽然是 git 常用功能，但是强烈建议不要使用 git 命令来完成这项工作。" }), "\n", _jsx(_components.p, { children: "因为如果出现代码冲突，在没有代码比对工具的情况下，实在太艰难了。" }), "\n", _jsx(_components.p, { children: "你可以考虑使用各种 Git GUI 工具。" }), "\n"] }), "\n", _jsxs(_components.h3, { id: "将分支合并到当前-head-中", children: [_jsx(_components.a, { className: "heading-link", href: "#将分支合并到当前-head-中", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "将分支合并到当前 HEAD 中"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " merge ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "将当前-head-版本重置到分支中", children: [_jsx(_components.a, { className: "heading-link", href: "#将当前-head-版本重置到分支中", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "将当前 HEAD 版本重置到分支中"] }), "\n", _jsx(_components.pre, { className: "language-bash", children: _jsx(_components.code, { className: "language-bash code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token operator", children: "<" }), "branch", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "撤销-rebasemerge", children: [_jsx(_components.a, { className: "heading-link", href: "#撤销-rebasemerge", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "撤销 rebase/merge"] }), "\n", _jsx(_components.p, { children: "你可以合并(merge)或 rebase 了一个错误的分支, 或者完成不了一个进行中的 rebase/merge。 Git 在进行危险操作的时候会把原始的 HEAD 保存在一个叫 ORIG_HEAD 的变量里, 所以要把分支恢复到 rebase/merge 前的状态是很容易的。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " ORIG_HEAD\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我已经-rebase-过-但是我不想强推force-push", children: [_jsx(_components.a, { className: "heading-link", href: "#我已经-rebase-过-但是我不想强推force-push", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我已经 rebase 过, 但是我不想强推(force push)"] }), "\n", _jsx(_components.p, { children: "不幸的是，如果你想把这些变化(changes)反应到远程分支上，你就必须得强推(force push)。是因你快进(Fast forward)了提交，改变了 Git 历史, 远程分支不会接受变化(changes)，除非强推(force push)。这就是许多人使用 merge 工作流, 而不是 rebasing 工作流的主要原因之一，开发者的强推(force push)会使大的团队陷入麻烦。使用时需要注意，一种安全使用 rebase 的方法是，不要把你的变化(changes)反映到远程分支上, 而是按下面的做:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout my-branch\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token parameter variable", children: "-i" }), " master\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " checkout master\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " merge --ff-only my-branch\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["更多, 参见 ", _jsx(_components.a, { href: "http://stackoverflow.com/questions/11058312/how-can-i-use-git-rebase-without-requiring-a-forced-push", target: "_blank", rel: "noopener noreferrer", children: "this SO thread" }), "."] }), "\n", _jsxs(_components.h3, { id: "我需要组合combine几个提交commit", children: [_jsx(_components.a, { className: "heading-link", href: "#我需要组合combine几个提交commit", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我需要组合(combine)几个提交(commit)"] }), "\n", _jsxs(_components.p, { children: ["假设你的工作分支将会做对于 ", _jsx(_components.code, { className: "language-auto", children: "master" }), " 的 pull-request。一般情况下你不关心提交(commit)的时间戳，只想组合 ", _jsx(_components.em, { children: "所有" }), " 提交(commit) 到一个单独的里面, 然后重置(reset)重提交(recommit)。确保主(master)分支是最新的和你的变化都已经提交了, 然后:"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--soft" }), " master\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " commit ", _jsx(_components.span, { className: "token parameter variable", children: "-am" }), " ", _jsx(_components.span, { className: "token string", children: "\"New awesome feature\"" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "如果你想要更多的控制, 想要保留时间戳, 你需要做交互式 rebase (interactive rebase):" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token parameter variable", children: "-i" }), " master\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["如果没有相对的其它分支，你将不得不相对自己的", _jsx(_components.code, { className: "language-auto", children: "HEAD" }), " 进行 rebase。例如：你想组合最近的两次提交(commit), 你将相对于", _jsx(_components.code, { className: "language-auto", children: "HEAD\\~2" }), " 进行 rebase，组合最近 3 次提交(commit), 相对于", _jsx(_components.code, { className: "language-auto", children: "HEAD\\~3" }), ", 等等。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token parameter variable", children: "-i" }), " HEAD~2\n"] }) }) }), "\n", _jsx(_components.p, { children: "在你执行了交互式 rebase 的命令(interactive rebase command)后, 你将在你的编辑器里看到类似下面的内容:" }), "\n", _jsx(_components.pre, { className: "language-vim", children: _jsxs(_components.code, { className: "language-vim code-highlight", children: [_jsx(_components.span, { className: "code-line", children: "pick a9c8a1d Some refactoring\n" }), _jsx(_components.span, { className: "code-line", children: "pick 01b2fd8 New awesome feature\n" }), _jsx(_components.span, { className: "code-line", children: "pick b729ad5 fixup\n" }), _jsxs(_components.span, { className: "code-line", children: ["pick e3851e8 another ", _jsx(_components.span, { className: "token keyword", children: "fix" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: ["## Rebase 8074d12", _jsx(_components.span, { className: "token operator", children: "." }), _jsx(_components.span, { className: "token operator", children: "." }), "b729ad5 onto 8074d12\n"] }), _jsx(_components.span, { className: "code-line", children: "#\n" }), _jsxs(_components.span, { className: "code-line", children: ["## Commands", _jsx(_components.span, { className: "token punctuation", children: ":" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## ", _jsx(_components.span, { className: "token keyword", children: "p" }), _jsx(_components.span, { className: "token punctuation", children: "," }), " pick ", _jsx(_components.span, { className: "token operator", children: "=" }), " use commit\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## ", _jsx(_components.span, { className: "token keyword", children: "r" }), _jsx(_components.span, { className: "token punctuation", children: "," }), " reword ", _jsx(_components.span, { className: "token operator", children: "=" }), " use commit", _jsx(_components.span, { className: "token punctuation", children: "," }), " but ", _jsx(_components.span, { className: "token keyword", children: "edit" }), " the commit message\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## ", _jsx(_components.span, { className: "token keyword", children: "e" }), _jsx(_components.span, { className: "token punctuation", children: "," }), " ", _jsx(_components.span, { className: "token keyword", children: "edit" }), " ", _jsx(_components.span, { className: "token operator", children: "=" }), " use commit", _jsx(_components.span, { className: "token punctuation", children: "," }), " but ", _jsx(_components.span, { className: "token keyword", children: "stop" }), " ", _jsx(_components.span, { className: "token keyword", children: "for" }), " amending\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## s", _jsx(_components.span, { className: "token punctuation", children: "," }), " squash ", _jsx(_components.span, { className: "token operator", children: "=" }), " use commit", _jsx(_components.span, { className: "token punctuation", children: "," }), " but meld into ", _jsx(_components.span, { className: "token keyword", children: "previous" }), " commit\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## ", _jsx(_components.span, { className: "token keyword", children: "f" }), _jsx(_components.span, { className: "token punctuation", children: "," }), " fixup ", _jsx(_components.span, { className: "token operator", children: "=" }), " like ", _jsx(_components.span, { className: "token string", children: "\"squash\"" }), _jsx(_components.span, { className: "token punctuation", children: "," }), " but discard this commit's log message\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## ", _jsx(_components.span, { className: "token keyword", children: "x" }), _jsx(_components.span, { className: "token punctuation", children: "," }), " exec ", _jsx(_components.span, { className: "token operator", children: "=" }), " run command ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "the rest of the line", _jsx(_components.span, { className: "token punctuation", children: ")" }), " using ", _jsx(_components.span, { className: "token keyword", children: "shell" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "#\n" }), _jsxs(_components.span, { className: "code-line", children: ["## These ", _jsx(_components.span, { className: "token builtin", children: "lines" }), " can ", _jsx(_components.span, { className: "token keyword", children: "be" }), " re", _jsx(_components.span, { className: "token operator", children: "-" }), "ordered", _jsx(_components.span, { className: "token punctuation", children: ";" }), " they are executed from ", _jsx(_components.span, { className: "token builtin", children: "top" }), " ", _jsx(_components.span, { className: "token keyword", children: "to" }), " bottom", _jsx(_components.span, { className: "token operator", children: "." }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "#\n" }), _jsxs(_components.span, { className: "code-line", children: ["## If you remove a line here THAT COMMIT WILL BE LOST", _jsx(_components.span, { className: "token operator", children: "." }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "#\n" }), _jsxs(_components.span, { className: "code-line", children: ["## However", _jsx(_components.span, { className: "token punctuation", children: "," }), " ", _jsx(_components.span, { className: "token keyword", children: "if" }), " you remove everything", _jsx(_components.span, { className: "token punctuation", children: "," }), " the rebase will ", _jsx(_components.span, { className: "token keyword", children: "be" }), " aborted", _jsx(_components.span, { className: "token operator", children: "." }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "#\n" }), _jsx(_components.span, { className: "code-line", children: "## Note that empty commits are commented out\n" })] }) }), "\n", _jsxs(_components.p, { children: ["所有以 ", _jsx(_components.code, { className: "language-auto", children: "#" }), " 开头的行都是注释, 不会影响 rebase."] }), "\n", _jsxs(_components.p, { children: ["然后，你可以用任何上面命令列表的命令替换 ", _jsx(_components.code, { className: "language-auto", children: "pick" }), ", 你也可以通过删除对应的行来删除一个提交(commit)。"] }), "\n", _jsxs(_components.p, { children: ["例如, 如果你想 ", _jsx(_components.strong, { children: "单独保留最旧(first)的提交(commit),组合所有剩下的到第二个里面" }), ", 你就应该编辑第二个提交(commit)后面的每个提交(commit) 前的单词为 ", _jsx(_components.code, { className: "language-auto", children: "f" }), ":"] }), "\n", _jsx(_components.pre, { className: "language-vim", children: _jsxs(_components.code, { className: "language-vim code-highlight", children: [_jsx(_components.span, { className: "code-line", children: "pick a9c8a1d Some refactoring\n" }), _jsx(_components.span, { className: "code-line", children: "pick 01b2fd8 New awesome feature\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token keyword", children: "f" }), " b729ad5 fixup\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token keyword", children: "f" }), " e3851e8 another ", _jsx(_components.span, { className: "token keyword", children: "fix" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["如果你想组合这些提交(commit) ", _jsx(_components.strong, { children: "并重命名这个提交(commit)" }), ", 你应该在第二个提交(commit)旁边添加一个", _jsx(_components.code, { className: "language-auto", children: "r" }), "，或者更简单的用", _jsx(_components.code, { className: "language-auto", children: "s" }), " 替代 ", _jsx(_components.code, { className: "language-auto", children: "f" }), ":"] }), "\n", _jsx(_components.pre, { className: "language-vim", children: _jsxs(_components.code, { className: "language-vim code-highlight", children: [_jsx(_components.span, { className: "code-line", children: "pick a9c8a1d Some refactoring\n" }), _jsx(_components.span, { className: "code-line", children: "pick 01b2fd8 New awesome feature\n" }), _jsx(_components.span, { className: "code-line", children: "s b729ad5 fixup\n" }), _jsxs(_components.span, { className: "code-line", children: ["s e3851e8 another ", _jsx(_components.span, { className: "token keyword", children: "fix" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "你可以在接下来弹出的文本提示框里重命名提交(commit)。" }), "\n", _jsx(_components.pre, { className: "language-vim", children: _jsxs(_components.code, { className: "language-vim code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: ["Newer", _jsx(_components.span, { className: "token punctuation", children: "," }), " awesomer features\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: ["## Please enter the commit message ", _jsx(_components.span, { className: "token keyword", children: "for" }), " your ", _jsx(_components.span, { className: "token keyword", children: "changes" }), _jsx(_components.span, { className: "token operator", children: "." }), " Lines starting\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## with ", _jsx(_components.span, { className: "token string", children: "'#'" }), " will ", _jsx(_components.span, { className: "token keyword", children: "be" }), " ignored", _jsx(_components.span, { className: "token punctuation", children: "," }), " and an empty message aborts the commit", _jsx(_components.span, { className: "token operator", children: "." }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## rebase ", _jsx(_components.span, { className: "token keyword", children: "in" }), " progress", _jsx(_components.span, { className: "token punctuation", children: ";" }), " onto 8074d12\n"] }), _jsxs(_components.span, { className: "code-line", children: ["## You are currently editing a commit ", _jsx(_components.span, { className: "token keyword", children: "while" }), " rebasing branch ", _jsx(_components.span, { className: "token string", children: "'master'" }), " ", _jsx(_components.span, { className: "token keyword", children: "on" }), " ", _jsx(_components.span, { className: "token string", children: "'8074d12'" }), _jsx(_components.span, { className: "token operator", children: "." }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "#\n" }), _jsxs(_components.span, { className: "code-line", children: ["## Changes ", _jsx(_components.span, { className: "token keyword", children: "to" }), " ", _jsx(_components.span, { className: "token keyword", children: "be" }), " committed", _jsx(_components.span, { className: "token punctuation", children: ":" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["# ", _jsx(_components.span, { className: "token builtin", children: "modified" }), _jsx(_components.span, { className: "token punctuation", children: ":" }), " README", _jsx(_components.span, { className: "token operator", children: "." }), "md\n"] }), _jsx(_components.span, { className: "code-line", children: "#\n" }), _jsx(_components.span, { className: "code-line", children: "\n" })] }) }), "\n", _jsx(_components.p, { children: "如果成功了, 你应该看到类似下面的内容:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ Successfully rebased and updated refs/heads/master.\n"] }) }) }), "\n", _jsxs(_components.h4, { id: "安全合并merging策略", children: [_jsx(_components.a, { className: "heading-link", href: "#安全合并merging策略", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "安全合并(merging)策略"] }), "\n", _jsxs(_components.p, { children: [_jsx(_components.code, { className: "language-auto", children: "--no-commit" }), " 执行合并(merge)但不自动提交, 给用户在做提交前检查和修改的机会。 ", _jsx(_components.code, { className: "language-auto", children: "no-ff" }), " 会为特性分支(feature branch)的存在过留下证据, 保持项目历史一致。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " merge --no-ff --no-commit my-branch\n"] }) }) }), "\n", _jsxs(_components.h4, { id: "我需要将一个分支合并成一个提交commit", children: [_jsx(_components.a, { className: "heading-link", href: "#我需要将一个分支合并成一个提交commit", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我需要将一个分支合并成一个提交(commit)"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " merge ", _jsx(_components.span, { className: "token parameter variable", children: "--squash" }), " my-branch\n"] }) }) }), "\n", _jsxs(_components.h4, { id: "我只想组合combine未推的提交unpushed-commit", children: [_jsx(_components.a, { className: "heading-link", href: "#我只想组合combine未推的提交unpushed-commit", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我只想组合(combine)未推的提交(unpushed commit)"] }), "\n", _jsx(_components.p, { children: "有时候，在将数据推向上游之前，你有几个正在进行的工作提交(commit)。这时候不希望把已经推(push)过的组合进来，因为其他人可能已经有提交(commit)引用它们了。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token parameter variable", children: "-i" }), " @", _jsx(_components.span, { className: "token punctuation", children: "{" }), "u", _jsx(_components.span, { className: "token punctuation", children: "}" }), "\n"] }) }) }), "\n", _jsx(_components.p, { children: "这会产生一次交互式的 rebase(interactive rebase), 只会列出没有推(push)的提交(commit)，在这个列表时进行 reorder/fix/squash 都是安全的。" }), "\n", _jsxs(_components.h3, { id: "检查是否分支上的所有提交commit都合并merge过了", children: [_jsx(_components.a, { className: "heading-link", href: "#检查是否分支上的所有提交commit都合并merge过了", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "检查是否分支上的所有提交(commit)都合并(merge)过了"] }), "\n", _jsx(_components.p, { children: "检查一个分支上的所有提交(commit)是否都已经合并(merge)到了其它分支, 你应该在这些分支的 head(或任何 commits)之间做一次 diff:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " log ", _jsx(_components.span, { className: "token parameter variable", children: "--graph" }), " --left-right --cherry-pick ", _jsx(_components.span, { className: "token parameter variable", children: "--oneline" }), " HEAD", _jsx(_components.span, { className: "token punctuation", children: ".." }), ".feature/120-on-scroll\n"] }) }) }), "\n", _jsx(_components.p, { children: "这会告诉你在一个分支里有而另一个分支没有的所有提交(commit), 和分支之间不共享的提交(commit)的列表。另一个做法可以是:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " log master ^feature/120-on-scroll --no-merges\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "交互式-rebaseinteractive-rebase可能出现的问题", children: [_jsx(_components.a, { className: "heading-link", href: "#交互式-rebaseinteractive-rebase可能出现的问题", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "交互式 rebase(interactive rebase)可能出现的问题"] }), "\n", _jsxs(_components.h4, { id: "这个-rebase-编辑屏幕出现noop", children: [_jsx(_components.a, { className: "heading-link", href: "#这个-rebase-编辑屏幕出现noop", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "这个 rebase 编辑屏幕出现'noop'"] }), "\n", _jsx(_components.p, { children: "如果你看到的是这样:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsx(_components.span, { className: "code-line", children: "noop\n" }) }) }), "\n", _jsxs(_components.p, { children: ["这意味着你 rebase 的分支和当前分支在同一个提交(commit)上, 或者 ", _jsx(_components.em, { children: "领先(ahead)" }), " 当前分支。你可以尝试:"] }), "\n", _jsxs(_components.ul, { children: ["\n", _jsx(_components.li, { children: "检查确保主(master)分支没有问题" }), "\n", _jsxs(_components.li, { children: ["rebase ", _jsx(_components.code, { className: "language-auto", children: "HEAD\\~2" }), " 或者更早"] }), "\n"] }), "\n", _jsxs(_components.h4, { id: "有冲突的情况", children: [_jsx(_components.a, { className: "heading-link", href: "#有冲突的情况", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "有冲突的情况"] }), "\n", _jsx(_components.p, { children: "如果你不能成功的完成 rebase, 你可能必须要解决冲突。" }), "\n", _jsxs(_components.p, { children: ["首先执行 ", _jsx(_components.code, { className: "language-auto", children: "git status" }), " 找出哪些文件有冲突:"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " status\n"] }), _jsx(_components.span, { className: "code-line", children: "On branch my-branch\n" }), _jsxs(_components.span, { className: "code-line", children: ["Changes not staged ", _jsx(_components.span, { className: "token keyword", children: "for" }), " commit:\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "use ", _jsx(_components.span, { className: "token string", children: "\"git add ...\"" }), " to update what will be committed", _jsx(_components.span, { className: "token punctuation", children: ")" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token punctuation", children: "(" }), "use ", _jsx(_components.span, { className: "token string", children: "\"git checkout -- ...\"" }), " to discard changes ", _jsx(_components.span, { className: "token keyword", children: "in" }), " working directory", _jsx(_components.span, { className: "token punctuation", children: ")" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsx(_components.span, { className: "code-line", children: " modified: README.md\n" })] }) }), "\n", _jsxs(_components.p, { children: ["在这个例子里面, ", _jsx(_components.code, { className: "language-auto", children: "README.md" }), " 有冲突。打开这个文件找到类似下面的内容:"] }), "\n", _jsx(_components.pre, { className: "language-vim", children: _jsxs(_components.code, { className: "language-vim code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token operator", children: "<" }), _jsx(_components.span, { className: "token operator", children: "<" }), _jsx(_components.span, { className: "token operator", children: "<" }), _jsx(_components.span, { className: "token operator", children: "<" }), _jsx(_components.span, { className: "token operator", children: "<" }), _jsx(_components.span, { className: "token operator", children: "<" }), _jsx(_components.span, { className: "token operator", children: "<" }), " HEAD\n"] }), _jsx(_components.span, { className: "code-line", children: " some code\n" }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token operator", children: "==" }), _jsx(_components.span, { className: "token operator", children: "==" }), _jsx(_components.span, { className: "token operator", children: "==" }), _jsx(_components.span, { className: "token operator", children: "==" }), _jsx(_components.span, { className: "token operator", children: "=" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: " some code\n" }), _jsxs(_components.span, { className: "code-line", children: [" ", _jsx(_components.span, { className: "token operator", children: ">" }), _jsx(_components.span, { className: "token operator", children: ">" }), _jsx(_components.span, { className: "token operator", children: ">" }), _jsx(_components.span, { className: "token operator", children: ">" }), _jsx(_components.span, { className: "token operator", children: ">" }), _jsx(_components.span, { className: "token operator", children: ">" }), _jsx(_components.span, { className: "token operator", children: ">" }), " ", _jsx(_components.span, { className: "token keyword", children: "new" }), _jsx(_components.span, { className: "token operator", children: "-" }), "commit\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["你需要解决新提交的代码(示例里, 从中间", _jsx(_components.code, { className: "language-auto", children: "==" }), "线到", _jsx(_components.code, { className: "language-auto", children: "new-commit" }), "的地方)与", _jsx(_components.code, { className: "language-auto", children: "HEAD" }), " 之间不一样的地方."] }), "\n", _jsx(_components.p, { children: "有时候这些合并非常复杂，你应该使用可视化的差异编辑器(visual diff editor):" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master*", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " mergetool ", _jsx(_components.span, { className: "token parameter variable", children: "-t" }), " opendiff\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["在你解决完所有冲突和测试过后, ", _jsx(_components.code, { className: "language-auto", children: "git add" }), " 变化了的(changed)文件, 然后用", _jsx(_components.code, { className: "language-auto", children: "git rebase --continue" }), " 继续 rebase。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "add" }), " README.md\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token parameter variable", children: "--continue" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["如果在解决完所有的冲突过后，得到了与提交前一样的结果, 可以执行", _jsx(_components.code, { className: "language-auto", children: "git rebase --skip" }), "。"] }), "\n", _jsx(_components.p, { children: "任何时候你想结束整个 rebase 过程，回来 rebase 前的分支状态, 你可以做:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "my-branch", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " rebase ", _jsx(_components.span, { className: "token parameter variable", children: "--abort" }), "\n"] }) }) }), "\n", _jsxs(_components.h2, { id: "查看信息", children: [_jsx(_components.a, { className: "heading-link", href: "#查看信息", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "查看信息"] }), "\n", _jsxs(_components.p, { children: ["显示工作路径下已修改的文件：", _jsx(_components.code, { className: "language-auto", children: "git status" })] }), "\n", _jsxs(_components.p, { children: ["显示与上次提交版本文件的不同：", _jsx(_components.code, { className: "language-auto", children: "git diff" })] }), "\n", _jsx(_components.p, { children: "显示提交历史：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 从最新提交开始，显示所有的提交记录（显示hash，作者信息，提交的标题和时间）" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " log\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 显示某个用户的所有提交" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " log ", _jsx(_components.span, { className: "token parameter variable", children: "--author" }), _jsx(_components.span, { className: "token operator", children: "=" }), _jsx(_components.span, { className: "token string", children: "\"username\"" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 显示某个文件的所有修改" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " log ", _jsx(_components.span, { className: "token parameter variable", children: "-p" }), " ", _jsx(_components.span, { className: "token operator", children: "<" }), "file", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] })] }) }), "\n", _jsx(_components.p, { children: "显示搜索内容：" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 从当前目录的所有文件中查找文本内容" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "grep" }), " ", _jsx(_components.span, { className: "token string", children: "\"Hello\"" }), "\n"] }), _jsx(_components.span, { className: "code-line", children: "\n" }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# 在某一版本中搜索文本" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: ["$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "grep" }), " ", _jsx(_components.span, { className: "token string", children: "\"Hello\"" }), " v2.5\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "其他", children: [_jsx(_components.a, { className: "heading-link", href: "#其他", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "其他"] }), "\n", _jsxs(_components.h3, { id: "克隆所有子模块", children: [_jsx(_components.a, { className: "heading-link", href: "#克隆所有子模块", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "克隆所有子模块"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " clone ", _jsx(_components.span, { className: "token parameter variable", children: "--recursive" }), " git://github.com/foo/bar.git\n"] }) }) }), "\n", _jsx(_components.p, { children: "如果已经克隆了:" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " submodule update ", _jsx(_components.span, { className: "token parameter variable", children: "--init" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--recursive" }), "\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "已删除补丁patch", children: [_jsx(_components.a, { className: "heading-link", href: "#已删除补丁patch", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "已删除补丁(patch)"] }), "\n", _jsxs(_components.p, { children: ["如果某人在 GitHub 上给你发了一个 pull request, 但是然后他删除了他自己的原始 fork, 你将没法克隆他们的提交(commit)或使用 ", _jsx(_components.code, { className: "language-auto", children: "git am" }), "。在这种情况下, 最好手动的查看他们的提交(commit)，并把它们拷贝到一个本地新分支，然后做提交。"] }), "\n", _jsxs(_components.p, { children: ["做完提交后, 再修改作者，参见", _jsx(_components.a, { href: "#commit-wrong-author", children: "变更作者" }), "。然后, 应用变化, 再发起一个新的 pull request。"] }), "\n", _jsxs(_components.h2, { id: "跟踪文件tracking-files", children: [_jsx(_components.a, { className: "heading-link", href: "#跟踪文件tracking-files", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "跟踪文件(Tracking Files)"] }), "\n", _jsxs(_components.h3, { id: "我只想改变一个文件名字的大小写而不修改内容", children: [_jsx(_components.a, { className: "heading-link", href: "#我只想改变一个文件名字的大小写而不修改内容", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我只想改变一个文件名字的大小写，而不修改内容"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "mv" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--force" }), " myfile MyFile\n"] }) }) }), "\n", _jsxs(_components.h3, { id: "我想从-git-删除一个文件但保留该文件", children: [_jsx(_components.a, { className: "heading-link", href: "#我想从-git-删除一个文件但保留该文件", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我想从 Git 删除一个文件，但保留该文件"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " ", _jsx(_components.span, { className: "token function", children: "rm" }), " ", _jsx(_components.span, { className: "token parameter variable", children: "--cached" }), " log.txt\n"] }) }) }), "\n", _jsxs(_components.h2, { id: "fork-项目", children: [_jsx(_components.a, { className: "heading-link", href: "#fork-项目", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "Fork 项目"] }), "\n", _jsx(_components.p, { children: "GitHub 中 Fork 是服务端的代码仓库克隆（即新克隆出来的代码仓库在远程服务端），包含了原来的仓库（即 upstream repository，上游仓库）所有内容，如分支、Tag、提交。代码托管服务（如 Github、BitBucket）提供了方便的完成 Fork 操作的功能（在仓库页面点一下 Fork 按钮）。这样有了一个你自己的可以自由提交的远程仓库，然后可以通过的 Pull Request 把你的提交贡献回原仓库。而对于原仓库 Owner 来说，鼓励别人 Fork 自己的仓库，通过 Pull Request 给自己的仓库做贡献，也能提高了自己仓库的知名度。" }), "\n", _jsxs(_components.blockquote, { children: ["\n", _jsxs(_components.p, { children: ["参考：", _jsx(_components.a, { href: "https://docs.github.com/en/github/getting-started-with-github/fork-a-repo", target: "_blank", rel: "noopener noreferrer", children: "Fork a repo" })] }), "\n"] }), "\n", _jsxs(_components.p, { children: ["（1）执行 ", _jsx(_components.code, { className: "language-auto", children: "git remote -v" }), "，您将看到当前为 fork 配置的远程存储库。"] }), "\n", _jsx(_components.p, { children: "（2）添加上游项目的仓库地址" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " remote ", _jsx(_components.span, { className: "token function", children: "add" }), " upstream ", _jsx(_components.span, { className: "token operator", children: "<" }), "github仓库地址", _jsx(_components.span, { className: "token operator", children: ">" }), "\n"] }) }) }), "\n", _jsxs(_components.p, { children: ["（3）确认是否添加成功，再次键入 ", _jsx(_components.code, { className: "language-auto", children: "git remote -v" }), "。"] }), "\n", _jsxs(_components.p, { children: ["（4）获取上游项目更新，可以执行 ", _jsx(_components.code, { className: "language-auto", children: "git fetch upstream" })] }), "\n", _jsx(_components.p, { children: "（5）同步上游项目的代码到新仓库" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# merge" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " merge upstream/master\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token comment", children: "# rebase" }), "\n"] }), _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " rebase upstream/master origin/master\n"] })] }) }), "\n", _jsxs(_components.h2, { id: "我不知道我做错了些什么", children: [_jsx(_components.a, { className: "heading-link", href: "#我不知道我做错了些什么", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "我不知道我做错了些什么"] }), "\n", _jsxs(_components.p, { children: ["你把事情搞砸了：你 ", _jsx(_components.code, { className: "language-auto", children: "重置(reset)" }), " 了一些东西, 或者你合并了错误的分支, 亦或你强推了后找不到你自己的提交(commit)了。有些时候, 你一直都做得很好, 但你想回到以前的某个状态。"] }), "\n", _jsxs(_components.p, { children: ["这就是 ", _jsx(_components.code, { className: "language-auto", children: "git reflog" }), " 的目的， ", _jsx(_components.code, { className: "language-auto", children: "reflog" }), " 记录对分支顶端(the tip of a branch)的任何改变, 即使那个顶端没有被任何分支或标签引用。基本上, 每次 HEAD 的改变, 一条新的记录就会增加到", _jsx(_components.code, { className: "language-auto", children: "reflog" }), "。遗憾的是，这只对本地分支起作用，且它只跟踪动作 (例如，不会跟踪一个没有被记录的文件的任何改变)。"] }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsxs(_components.code, { className: "language-shell code-highlight", children: [_jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token punctuation", children: "(" }), "master", _jsx(_components.span, { className: "token punctuation", children: ")" }), "$ ", _jsx(_components.span, { className: "token function", children: "git" }), " reflog\n"] }), _jsxs(_components.span, { className: "code-line", children: ["0a2e358 HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "0" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": reset: moving to HEAD", _jsx(_components.span, { className: "token punctuation", children: "\\" }), "~2\n"] }), _jsxs(_components.span, { className: "code-line", children: ["0254ea7 HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "1" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": checkout: moving from ", _jsx(_components.span, { className: "token number", children: "2.2" }), " to master\n"] }), _jsxs(_components.span, { className: "code-line", children: ["c10f740 HEAD@", _jsx(_components.span, { className: "token punctuation", children: "{" }), _jsx(_components.span, { className: "token number", children: "2" }), _jsx(_components.span, { className: "token punctuation", children: "}" }), ": checkout: moving from master to ", _jsx(_components.span, { className: "token number", children: "2.2" }), "\n"] })] }) }), "\n", _jsxs(_components.p, { children: ["上面的 reflog 展示了从 master 分支签出(checkout)到 2.2 分支，然后再签回。那里，还有一个硬重置(hard reset)到一个较旧的提交。最新的动作出现在最上面以 ", _jsx(_components.code, { className: "language-auto", children: "HEAD@{0}" }), "标识."] }), "\n", _jsx(_components.p, { children: "如果事实证明你不小心回移(move back)了提交(commit), reflog 会包含你不小心回移前 master 上指向的提交(0254ea7)。" }), "\n", _jsx(_components.pre, { className: "language-shell", children: _jsx(_components.code, { className: "language-shell code-highlight", children: _jsxs(_components.span, { className: "code-line", children: [_jsx(_components.span, { className: "token function", children: "git" }), " reset ", _jsx(_components.span, { className: "token parameter variable", children: "--hard" }), " 0254ea7\n"] }) }) }), "\n", _jsx(_components.p, { children: "然后使用 git reset 就可以把 master 改回到之前的 commit，这提供了一个在历史被意外更改情况下的安全网。" }), "\n", _jsxs(_components.h2, { id: "-资料", children: [_jsx(_components.a, { className: "heading-link", href: "#-资料", children: _jsx(_components.svg, { xmlns: "http:www.w3.org/2000/svg", fill: "#ab2b65", viewBox: "0 0 20 20", className: "w-5 h-5", children: _jsx(_components.path, { fillRule: "evenodd", clipRule: "evenodd", d: "M9.493 2.853a.75.75 0 00-1.486-.205L7.545 6H4.198a.75.75 0 000 1.5h3.14l-.69 5H3.302a.75.75 0 000 1.5h3.14l-.435 3.148a.75.75 0 001.486.205L7.955 14h2.986l-.434 3.148a.75.75 0 001.486.205L12.456 14h3.346a.75.75 0 000-1.5h-3.14l.69-5h3.346a.75.75 0 000-1.5h-3.14l.435-3.147a.75.75 0 00-1.486-.205L12.045 6H9.059l.434-3.147zM8.852 7.5l-.69 5h2.986l.69-5H8.852z" }) }) }), "📚 资料"] }), "\n", _jsxs(_components.ul, { children: ["\n", _jsxs(_components.li, { children: [_jsx(_components.strong, { children: "官方资源" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://git-scm.com/", target: "_blank", rel: "noopener noreferrer", children: "Git 官网" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/git/git", target: "_blank", rel: "noopener noreferrer", children: "Git Github" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://guides.github.com/", target: "_blank", rel: "noopener noreferrer", children: "Github 官方教程" }) }), "\n"] }), "\n"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.strong, { children: "模板" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/github/gitignore", target: "_blank", rel: "noopener noreferrer", children: "gitignore 模板" }), " - .gitignore 文件模板"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/alexkaratarakis/gitattributes", target: "_blank", rel: "noopener noreferrer", children: "gitattributes 模板" }), " - .gitattributes 文件模板"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/tiimgreen/github-cheat-sheet", target: "_blank", rel: "noopener noreferrer", children: "github-cheat-sheet" }), " - git 命令简略图表"] }), "\n"] }), "\n"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.strong, { children: "Git 教程" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://learngitbranching.js.org/", target: "_blank", rel: "noopener noreferrer", children: "Learn Git branching" }), " - 交互式教程"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://git-scm.com/book/zh/v2", target: "_blank", rel: "noopener noreferrer", children: "Git 官方推荐教程" }), " - Scott Chacon 的 Git 书。", "\n", _jsxs(_components.ul, { children: ["\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/k88hudson/git-flight-rules", target: "_blank", rel: "noopener noreferrer", children: "git-flight-rules" }) }), "\n"] }), "\n"] }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/521xueweihan/git-tips", target: "_blank", rel: "noopener noreferrer", children: "git-tips" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/geeeeeeeeek/git-recipes", target: "_blank", rel: "noopener noreferrer", children: "Git 中文教程" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000", target: "_blank", rel: "noopener noreferrer", children: "廖雪峰的 Git 教程" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/xirong/my-git", target: "_blank", rel: "noopener noreferrer", children: "有关 git 的学习资源" }) }), "\n"] }), "\n"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.strong, { children: "文章" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/k88hudson/git-flight-rules/blob/master/README_zh-CN.md", target: "_blank", rel: "noopener noreferrer", children: "Git Cookbook" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/521xueweihan/git-tips", target: "_blank", rel: "noopener noreferrer", children: "Git 奇技淫巧" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://github.com/aseaday/git-style-guide", target: "_blank", rel: "noopener noreferrer", children: "Git 风格指南" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "http://www.cnblogs.com/cnblogsfans/p/5075073.html", target: "_blank", rel: "noopener noreferrer", children: "Git 在团队中的最佳实践–如何正确使用 Git Flow" }) }), "\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "http://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html", target: "_blank", rel: "noopener noreferrer", children: "Commit message 和 Change log 编写指南" }) }), "\n"] }), "\n"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.strong, { children: "Git 工具" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://git-scm.com/downloads/guis", target: "_blank", rel: "noopener noreferrer", children: "guis" }), " - Git 官网展示的客户端工具列表。"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/gogits/gogs", target: "_blank", rel: "noopener noreferrer", children: "gogs" }), " - 极易搭建的自助 Git 服务。"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/nvie/gitflow", target: "_blank", rel: "noopener noreferrer", children: "gitflow" }), " - 应用 ", _jsx(_components.a, { href: "http://nvie.com/posts/a-successful-git-branching-model/", target: "_blank", rel: "noopener noreferrer", children: "fit-flow" }), " 模型的工具。"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "http://firstaidgit.io/", target: "_blank", rel: "noopener noreferrer", children: "firstaidgit.io" }), " 一个可搜索的最常被问到的 Git 的问题"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/unixorn/git-extra-commands", target: "_blank", rel: "noopener noreferrer", children: "git-extra-commands" }), " - 一堆有用的额外的 Git 脚本"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/tj/git-extras", target: "_blank", rel: "noopener noreferrer", children: "git-extras" }), " - GIT 工具集 – repo summary, repl, changelog population, author commit percentages and more"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/qw3rtman/git-fire", target: "_blank", rel: "noopener noreferrer", children: "git-fire" }), " - git-fire 是一个 Git 插件，用于帮助在紧急情况下添加所有当前文件, 做提交(committing), 和推(push)到一个新分支(阻止合并冲突)。"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/git-tips/tips", target: "_blank", rel: "noopener noreferrer", children: "git-tips" }), " - Git 小提示"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/Originate/git-town", target: "_blank", rel: "noopener noreferrer", children: "git-town" }), " - 通用，高级 Git 工作流支持！"] }), "\n"] }), "\n"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.strong, { children: "GUI 客户端" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://www.gitkraken.com/", target: "_blank", rel: "noopener noreferrer", children: "GitKraken" }), " - 豪华的 Git 客户端 Windows, Mac & Linux"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://git-cola.github.io/", target: "_blank", rel: "noopener noreferrer", children: "git-cola" }), " - 另外一个 Git 客户端 Windows & OS X"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://github.com/git-up/GitUp", target: "_blank", rel: "noopener noreferrer", children: "GitUp" }), " - 一个新的 Git 客户端，在处理 Git 的复杂性上有自己的特点"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://rowanj.github.io/gitx/", target: "_blank", rel: "noopener noreferrer", children: "gitx-dev" }), " - 图形化的 Git 客户端 OS X"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "https://www.sourcetreeapp.com/", target: "_blank", rel: "noopener noreferrer", children: "Source Tree" }), " - 免费的图形化 Git 客户端 Windows & OS X"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.a, { href: "http://www.git-tower.com/", target: "_blank", rel: "noopener noreferrer", children: "Tower" }), " - 图形化 Git 客户端 OS X(付费)"] }), "\n"] }), "\n"] }), "\n", _jsxs(_components.li, { children: [_jsx(_components.strong, { children: "git cheat sheet" }), "\n", _jsxs(_components.ul, { children: ["\n", _jsx(_components.li, { children: _jsx(_components.a, { href: "https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf", target: "_blank", rel: "noopener noreferrer", children: "github-git-cheat-sheet" }) }), "\n"] }), "\n"] }), "\n"] })] }); } function MDXContent(props = {}) { const {wrapper: MDXLayout} = { ..._provideComponents(), ...props.components }; return MDXLayout ? _jsx(MDXLayout, { ...props, children: _jsx(_createMdxContent, { ...props }) }) : _createMdxContent(props); } return { default: MDXContent };