1

我用来git pull git@github.com:myaccount/random.git更新我的本地 git 目录。我在 shell 上找到了以下结果

 Fast forward
 .htaccess                         |    2 +-
 folder_name/file1.php                    |   74 ++--------------
 folder_name/file1.php                    |    2 +-
 folder_name/file2.php                    |    2 +-
 folder_name/css/style.css                 |    1 +
 folder_name/file3.html                     |  167 -------------------------------------
 folder_name/file4.php                      |   78 ++---------------
 folder_name/file5.php                   |   32 ++------
 folder_name/file6.php                     |  108 ------------------------
 folder_name/file7.php              |   77 -----------------
 folder_name/file8.php                     |    4 +-
 folder_name/file9.php                      |    5 +-
 folder_name/file10.php                      |   31 ++-----
 folder_name/file11.php                   |   16 ----
 folder_name/file12.php                     |   64 +++++---------
 folder_name/pics/items/file13.png |  Bin 0 -> 91578 bytes
 folder_name/file14.html                     |   44 ----------
 folder_name/file15.php                      |  102 ++++-------------------
 folder_name/file16.php                      |  112 +++----------------------
 19 files changed, 94 insertions(+), 827 deletions(-)
 create mode 100644 folder_name/.htaccess
 delete mode 100644 folder_name/file3.html
 delete mode 100644 folder_name/6.php
 delete mode 100644 folder_name/7.php
 delete mode 100644 folder_name/11.php
 create mode 100644 folder_name/pics/items/file13.png
 delete mode 100644 folder_name/file14.html

我试图理解以下输出并理解到极限。我知道什么是删除模式或创建模式。但是|符号后的数字是什么+-代表的是什么。是什么Fast Forward行首是什么。我发现了更多的东西,比如如果一个文件被删除,它的输出|只包含数字和-s。那么它实际上是什么意思呢?

4

1 回答 1

1

快进是散列提交指针移动到它可以不需要合并的最新提交。优点和缺点是对文件中行的更改,插入/删除消息是更改的总和。优点和缺点只是近似值。

于 2014-01-16T22:49:48.093 回答