January 2023
Intermediate to advanced
458 pages
14h 16m
Chinese
Content preview from 可编程网络自动化
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.
使用
Git
控制源代码
｜
253
注意到没有，
sw1.txt
文件的内容已经改变了。不过，这个过程有点儿麻烦。如果有一种更
简单的方法来显示仓库中某个文件的两个版本之间的差异，岂不是更好？这正是
git diff
命令的用武之地。
8.5.9
找出文件不同版本之间的差异
本章在开始的时候提到过，对网络自动化制品（交换机配置、
Python
脚本、
Jinja
模板等）
应用版本控制的好处之一是能够查看不同文件版本之间的差异。上一节展示过如何徒手比
较文件不同版本之间的差异，现在，来看一种更简单的方法：
git diff
命令。
注意，
Git
也支持集成第三方的
diff
工具，包括图形化工具。因此，也可以
使用
git difftool
代替
git diff
。
1.
检查提交之间的差异
git diff
命令会显示文件不同版本之间的差异（同一个文件在不同时间点的差异）。你只
需要提供待比较的文件及其两次提交的
SHA
哈希
。来看一个例子。先使用
git log
列出历
史记录，然后使用
git diff
比较文件的两个版本。
[vagrant@centos net-auto]$
git log --oneline
ed45c95 Adding .gitignore file
5cd13a8 Add Python script to talk to network switches
2a656c3 Add configuration for sw5
679c41c Update sw1, add sw4
9547063 First commit to ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access
More than 5,000 organizations count on O’Reilly
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.Julian F.
I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.Addison B.
I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.Amir M.
I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.