查询词典 git-up

The git-fsck(1) command runs a number of self-consistency checks on the repository, and reports on any problems.

git-fsck(1)命令在版本库中执行一系列的一致性性检查，并报告错误。

It's not safe to run git submodule update if you've made and committed changes within a submodule without checking out a branch first.

如果你并不是在首先提取一个分支的情况下运行 git submodule update 是不安全的。

If you just want to look at an old version of the file, without modifying the working directory, you can do that with git-show1

假如你只是想看看一个文件的旧版本是什么样子，而不想触动工作树的话，你可以用 git-show(1)命令这样做

If you would also like to include a comment with the tag, and possibly sign it cryptographically, then you should create a tag object instead; see the git-tag(1) man page for details.

如果你希望创建一个带注释和加密签注的标签的话，那么你应该创建一个标签对象的实例，详情请参考 git tag(1)的手册页。

However, the commits do not form a simple list; git allows lines of development to diverge and then reconverge, and the point where two lines of development reconverge is called a "merge".

无论如何，这些交付的组织形式都不会是简单的；git 容许开发路线可以分道扬镳，也可以殊途同归，两条开发线路的结合点我们叫&合并&。

Note that the reflog history is very different from normal git history.

注意，引用日志完全不同与正式的 git 历史记录。

Fortunately, git also keeps a log, called a "reflog", of all the previous values of each branch.

幸运的是，git 总是保存一个日志，叫&引用日志&，它保存了每个分支以前的值。

The reflog is also deleted; however, if you have not yet pruned the repository, then you may still be able to find the lost commits in the dangling objects that git-fsck reports.

此时引用日志也被删除了；不过如果你还没有剪裁版本库的话，你仍然可以在悬空对象中找回那些丢失的交付，git-fsck 会给你报告悬空对象的列表。

Also, git-status(1) will list those files as "unmerged", and the files with conflicts will have conflict markers added, like this

并且，git-status(1)将列举出&unmerged&的那些文件，文件中也会被加入冲突的标志，它看起来大致是这样

This will also remove any unreferenced objects (which may be created when, for example, you use "git-reset" to remove a commit).

这将会删除掉那些未被引用的对象（譬如，它们可能是由于你运行&git-reset&时遗弃了某些交付而产生的）。

Neither the killing of Mr Zarqawi nor any breakthrough on the political front will stop the insurgency and the fratricidal murders in their tracks.

在对危险的南部地区访问时，他斥责什叶派民兵领导人对中央集权的挑衅行为。

In fact,I've got him on the satellite mobile right now.

实际上 我们已接通卫星可视电话了