我使用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。那它究竟意味着什么?
答案 0 :(得分:1)
快进是散列提交指针移动到最新的提交它可以不需要合并。优缺点是文件中行的更改,插入/删除消息是更改的总和。优点和缺点只是近似值。