When I wrote the first edition, Git was still a relatively difficult to use and barely adopted tool for the harder core hacker. It was starting to gain steam in certain communities, but had not reached down, and the tool’s free-of-charge status was revoked. This prompted the Linux development community (and in particular Linus Torvalds, the creator of Linux) to develop their own tool based on some such as CVS, Subversion or Perforce — doing so will help you avoid subtle confusion when using the tool. Even though Git’s user interface is fairly similar to these other VCSs, Git stores and thinks about

user. When I wrote the first edition, Git was still a relatively difficult to use and barely adopted tool for the harder core hacker. It was starting to gain steam in certain communities, but had not reached down, and the tool’s free-of-charge status was revoked. This prompted the Linux development community (and in particular Linus Torvalds, the creator of Linux) to develop their own tool based on some such as CVS, Subversion or Perforce — doing so will help you avoid subtle confusion when using the tool. Even though Git’s user interface is fairly similar to these other VCSs, Git stores and thinks about

When I wrote the first edition, Git was still a relatively difficult to use and barely adopted tool for the harder core hacker. It was starting to gain steam in certain communities, but had not reached down, and the tool’s free-of-charge status was revoked. This prompted the Linux development community (and in particular Linus Torvalds, the creator of Linux) to develop their own tool based on some such as CVS, Subversion or Perforce — doing so will help you avoid subtle confusion when using the tool. Even though Git’s user interface is fairly similar to these other VCSs, Git stores and thinks about

diff 工具来比较差异。 可以使用 git difftool 命令来调用 emerge 或 vimdiff 等软件（包 括商业软件）输出 diff 的分析结果。 使用 git difftool --tool-help 命令来看你的系统 支持哪些 Git Diff 插件。 提交更新 现在的暂存区已经准备就绪，可以提交了。 在此之前，请务必确认还有什么已修改或新建的文件还没有 git add 过， 工具，并带领你一步一步解决这些冲突： $ git mergetool This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt 'index.html': {local}: modified file {remote}: modified file Hit return to start merge resolution tool (opendiff): 如果你想使用除默认工具（在这里 Git 使用 opendiff 做为默认的合并工具，因为作者在 Mac 上运行该程序） 外的其他合并工具，你可以在 “下列工具中（one

diff 工具来比较差异。 可以使用 git difftool 命令来调用 emerge 或 vimdiff 等软件（包 括商业软件）输出 diff 的分析结果。 使用 git difftool --tool-help 命令来看你的系统支 持哪些 Git Diff 插件。 提交更新 现在的暂存区已经准备就绪，可以提交了。 在此之前，请务必确认还有什么 已修改或新建的文件还没有 git add 过， 为你启动一个合适的可视化合并工具，并带领你一步一步解决这些冲突： $ git mergetool This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt 'index.html': {local}: modified file {remote}: modified file Hit return to start merge resolution tool (opendiff): 如果你想使用除默认工具（在这里 Git 使用 opendiff 做为默认的合并工具， 因为作者在 Mac 上运行该程序） 外的其他合并工具，你可以在 “下列工具中 （one