- publishing free software manuals
Picture of Cover

Comparing and Merging Files with GNU diff and patch

by David MacKenzie, Paul Eggert, and Richard Stallman

Paperback (6"x9"), 120 pages
Retail Price: $19.95 (£12.95 in UK)
ISBN: 0-9541617-5-0 (ISBN-13: 978-0-9541617-5-0)

Reviews

This book has received an extremely positive review in Linux User and Developer Magazine:
"Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004)

About the Book

This manual describes how to compare and merge files using GNU diff and patch.

It includes an extensive tutorial that guides the reader through all the options of the diff and patch commands. Later chapters cover powerful time-saving techniques such as automatic merging of divergent branches of a source tree.

This is a printed copy of the official GNU diffutils manual. It documents all the diffutils programs (diff, cmp, sdiff, diff3), plus GNU patch. The versions covered are the 2.8 release of GNU diffutils and 2.5 release of patch.

The authors of this manual are the original developers of the GNU diffutils programs.

You can examine the contents of the printed book here,

For each copy of this manual sold, $1 is donated to the Free Software Foundation.

As of December 2009 the total amount donated to FSF is $2,936 from the sale of this and other books.

This book is published under the GNU Free Documentation License.

Ordering

You can buy the book online at the following bookstores:

The manual can also be ordered from most physical bookstores using the ISBN number.

Print out the following flyer for detailed bookstore and library ordering information,

If the title is listed as "out-of-stock", please ask the bookstore to place an order with one of the wholesale suppliers given in the flyer.

If you encounter any difficulties in obtaining this book, please send an email to sales@network-theory.co.uk for assistance.

If you are not completely satisfied with your purchase for any reason we will gladly issue a full refund or replacement (details).

Electronic version

Download your own complete PDF version of "Comparing and Merging Files with GNU diff and patch" for only $4.95!

The PDF file is an exact copy of the printed book (regular price $19.95) optimized for on-screen viewing (see sample file).

To get a free PDF reader, visit PDFreaders.org.

For each electronic copy of this manual sold, $1 will be donated to the Free Software Foundation.

All the money raised supports the development of more free software and documentation.

Related Titles

Mailing List

Sign up to our company News mailing list or RSS feed to stay informed about this and other titles.

Further Information

For questions about this book, please use our email address sales@network-theory.co.uk.

Table of Contents

  1. Overview
  2. Comparison
  3. Output Formats
  4. Incomplete Lines
  5. Comparing Directories
  6. Adjusting Output
  7. diff Performance
  8. Comparing Three Files
  9. diff3 Merging
  10. Interactive Merging
  11. Merging with patch
  12. Making Patches
  13. Invoking cmp
  14. Invoking diff
  15. Invoking diff3
  16. Invoking patch
  17. Invoking sdiff
  18. Standards conformance
  19. Projects
  20. Copying This Manual
  21. Index

Articles

Resources