Git Merge：这些优势是什么意思？ [英] Git Merge: What do the pluses mean?

问题描述

我在Mac OS X上通过终端运行git merge，将一个分支合并到我的主设备中，并接收如下输出：

I ran "git merge" from Terminal on Mac OS X to merge a branch into my master and receive output that looks like:

 spec/models/user_spec.rb    57 ++++++++++++++++++++

57 ++++++++++++++++++++是什么意思？那是我插入/修改那个文件多少次？什么是所有的加法？

What does the "57 ++++++++++++++++++++" mean? Is that how many times I inserted/modified that file? What are all the plusses for?

推荐答案

改变了57行。这些加号是改变行数的图形指示，有点像条形图。当您更改了多个文件时，它们更有意义，因为它们提供了一种快速查看每个文件更改的相对数量的行。

57 lines changed. The pluses are graphical indications of the number of lines changed, kind of like a bar chart. They make more sense when you have changed several files, as they give a quick way to see the relative amount of lines changed per file.

我发现如果您只做了一些更改，则每个加号对应一行。如果你做得更多，它会缩小它们。

I've found that if you only make a few changes, each plus corresponds to one line. As you make more, it scales them back.

它也显示线删除的缺点。

It also shows minuses for line deletions.

如果你在另一个文件中做了28（57/2）行更改，你会看到一串长度在它旁边。

If you made 28 (57/2) line changes in another file, you would see a string of pluses half as long next to it.

这篇关于Git Merge：这些优势是什么意思？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！