Changes Committing Your Changes Skipping the Staging Area Removing Files Moving Files Viewing the Commit History Limiting Log Output Undoing Things Unstaging a Staged File Unmodifying a Modified File Workflow Patterns for Managing Source Code Branches Workflows Summary Contributing to a Project Commit Guidelines Private Small Team Private Managed Team Forked Public Project Public Project over Selection Single Revisions Short SHA-1 Branch References RefLog Shortnames Ancestry References Commit Ranges Interactive Staging Staging and Unstaging Files Staging Patches Stashing and Cleaning

Changes Committing Your Changes Skipping the Staging Area Removing Files Moving Files Viewing the Commit History Limiting Log Output Undoing Things Unstaging a Staged File Unmodifying a Modified File Workflow Patterns for Managing Source Code Branches Workflows Summary Contributing to a Project Commit Guidelines Private Small Team Private Managed Team Forked Public Project Public Project over Selection Single Revisions Short SHA-1 Branch References RefLog Shortnames Ancestry References Commit Ranges Interactive Staging Staging and Unstaging Files Staging Patches Stashing and Cleaning

. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 28 Viewing the Commit History . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . of its data more like a series of snapshots of a miniature filesystem. With Git, every time you commit, or save the state of your project, Git basically takes a picture of what all your files look like you’re offline or off VPN. If you get on an airplane or a train and want to do a little work, you can commit happily (to your local copy, remember?) until you get to a network connection to upload. If you

本章涵盖了你在使用 Git 完成各种工作时将 会用到的各种基本命令。 在学习完本章之后，你应该能够配置并初始化一个仓库（repository）、开始或停止跟 踪（track）文件、暂存（stage）或提交（commit）更改。 本章也将向你演示了如何配置 Git 来忽略指定的文 件和文件模式、如何迅速而简单地撤销错误操作、如何浏览你的项目的历史版本以及不同提交（commits）之间 的差异、如何向你的远程仓库 如果在一个已存在文件的文件夹（而非空文件夹）中进行版本控制，你应该开始追踪这些文件并进行初始提交。 可以通过 git add 命令来指定所需的文件来进行追踪，然后执行 git commit ： $ git add *.c $ git add LICENSE $ git commit -m 'initial project version' 稍后我们再逐一解释这些指令的行为。 现在，你已经得到了一个存在被追踪文件与初始提交的 样的 输出： $ git status On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean 这说明你现在的工作目录相当干净。换句话说，所有已跟踪文件在上次提交后都未被更改过。 此外，上面的信 息还表明，当前目录下没有出现任何处于未跟踪状态的新文件，否则

命令 git help 获取与创建项目 git init git clone 快照基础 git add git status git diff git difftool git commit git reset git rm git mv git clean 分支与合并 git branch git checkout git merge git mergetool 了你在使用 Git 完成各种工作时将会用到的各种基本命令。 在学习完本章之 后，你应该能够配置并初始化一个仓库（repository）、开始或停止跟踪 （track）文件、暂存（stage）或提交（commit）更改。 本章也将向你演示 了如何配置 Git 来忽略指定的文件和文件模式、如何迅速而简单地撤销错误操 作、如何浏览你的项目的历史版本以及不同提交（commits）之间的差异、如 何向你的 如果在一个已存在文件的文件夹（而非空文件夹）中进行版本控制，你应该开 始追踪这些文件并进行初始提交。 可以通过 git add 命令来指定所需的文件 来进行追踪，然后执行 git commit ： $ git add *.c $ git add LICENSE $ git commit -m 'initial project version' 稍后我们再逐一解释这些指令的行为。 现在，你已经得到了一个存在被追踪 文件与初始提交的

components Monolingual components Project configuration Adjusting interaction Component configuration Commit message formatting Importing speed Clone Git repository in advance Optimize configuration Disable with others Lazy commits Processing repository with scripts Post update repository processing Pre commit processing of translations Example - generating mo files in repository Translation process Suggestion AUTH_TOKEN_VALID AUTH_PASSWORD_DAYS AUTO_LOCK AUTO_LOCK_TIME AUTOFIX_LIST BACKGROUND_HOOKS CHECK_LIST COMMIT_PENDING_HOURS DATA_DIR DEFAULT_COMMITER_EMAIL DEFAULT_COMMITER_NAME DEFAULT_TRANSLATION_PROPAGATION

components Monolingual components Project configuration Adjusting interaction Component configuration Commit message formatting Importing speed Clone Git repository in advance Optimize configuration Disable with others Lazy commits Processing repository with scripts Post update repository processing Pre commit processing of translations Example - generating mo files in repository Translation process Suggestion Configuration ANONYMOUS_USER_NAME AUTO_LOCK AUTO_LOCK_TIME AUTOFIX_LIST BACKGROUND_HOOKS CHECK_LIST COMMIT_PENDING_HOURS DATA_DIR DEFAULT_COMMITER_EMAIL DEFAULT_COMMITER_NAME DEFAULT_TRANSLATION_PROPAGATION

components Monolingual components Project configuration Adjusting interaction Component configuration Commit message formatting Importing speed Clone Git repository in advance Optimize configuration Disable with others Lazy commits Processing repository with scripts Post update repository processing Pre commit processing of translations Example - generating mo files in repository Translation process Suggestion AUTH_TOKEN_VALID AUTH_PASSWORD_DAYS AUTO_LOCK AUTO_LOCK_TIME AUTOFIX_LIST BACKGROUND_HOOKS CHECK_LIST COMMIT_PENDING_HOURS DATA_DIR DEFAULT_COMMITER_EMAIL DEFAULT_COMMITER_NAME DEFAULT_TRANSLATION_PROPAGATION

components Monolingual components Project configuration Adjusting interaction Component configuration Commit message formatting Importing speed Clone Git repository in advance Optimize configuration Disable with others Lazy commits Processing repository with scripts Post update repository processing Pre commit processing of translations Example - generating mo files in repository Translation process Suggestion Configuration ANONYMOUS_USER_NAME AUTO_LOCK AUTO_LOCK_TIME AUTOFIX_LIST BACKGROUND_HOOKS CHECK_LIST COMMIT_PENDING_HOURS DATA_DIR DEFAULT_COMMITER_EMAIL DEFAULT_COMMITER_NAME DEFAULT_TRANSLATION_PROPAGATION

components Monolingual components Project configuration Adjusting interaction Component configuration Commit message formatting Importing speed Clone Git repository in advance Optimize configuration Disable with others Lazy commits Processing repository with scripts Post update repository processing Pre commit processing of translations Example - generating mo files in repository Translation process Suggestion Configuration ANONYMOUS_USER_NAME AUTO_LOCK AUTO_LOCK_TIME AUTOFIX_LIST BACKGROUND_HOOKS CHECK_LIST COMMIT_PENDING_HOURS DATA_DIR DEFAULT_COMMITER_EMAIL DEFAULT_COMMITER_NAME DEFAULT_TRANSLATION_PROPAGATION