Linux Tour (1): diff, patch and quilt (lower) 2 quilt
We can use CVs or SVN to manage all code for our own projects. But sometimes we need to use projects maintained by other developers. We need to modify some files, but we cannot directly submit
This article was reproduced from: Https://www.jianshu.com/p/e5d801b936b6Premise:
Generate Patch: git format-patch-m master generates the specified patch, 0163BED3BF59AE74C36CC5138B4C24F1556D8304 is a commit id,-1 is the start of the
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
General overview
diff [Options] source file destination file
Describe
In the simplest case, diff compares the contents of two files (source and destination files). The file name can be-text read by the standard input device. As a special case,
diff command explanation1. OverviewThere are good text comparison tools available under the Windows system, such as the common beyond Compare,winmerge is a comparison tool for graphical interfaces and very handy, and if you just work under Windows,
I. OverviewDiff and Patch are a pair of complementary tools, mathematically, diff is similar to the difference between two sets, and patches are similar to the and operations on two sets. Diff compares the differences of two files or collections of
If you don't refresh it, you forget to take this opportunity.
Diff
Diff is an essential tool for generating source code patches. The command format is:
Diff [command line option] new file of the original file
Common command line options
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.