Git diff compares the differences between the files in the tracking list and the files in the file system. If you are just starting to use it, use GIT GUI. Just like tortoiseSVN, those files will be changed like this . You can use git+coding to make it more obvious. Whichever line has been modified can be directly displayed.
git pull
命令可以解释为git fetch
+git merge
两步的合并体,其实在你执行git pull
You can see the general information of the merged file.You can use
git log -p -2
to view the last two submitted records. For more details, please refer to the git official website books.https://git-scm.com/book/zh/v2/Git-%E5%9F%BA%E7%A1%80-%E6%9F%A5%E7%9C%8B%E6%8F%90 %E4%BA%A4%E5%8E%86%E5%8F%B2
If you want to compare the differences of each file submitted twice in more detail, you can use the
git diff
commandGit diff compares the differences between the files in the tracking list and the files in the file system. If you are just starting to use it, use GIT GUI. Just like tortoiseSVN, those files will be changed like this . You can use git+coding to make it more obvious. Whichever line has been modified can be directly displayed.