- publishing free software manuals
Comparing and Merging Files with GNU diff and patch
by David MacKenzie, Paul Eggert, and Richard Stallman
Paperback (6"x9"), 120 pages
ISBN 0954161750
RRP £12.95 ($19.95)

"Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004) Get a printed copy>>>

B Index

&

  • ‘!’ output format
  • ‘+-’ output format
  • ‘<’ output format
  • ‘<<<<<<<’ for marking conflicts
  • _

  • _POSIX2_VERSION
  • a

  • aligning tab stops
  • alternate file names
  • b

  • backup file names
  • backup file strategy
  • binary file diff
  • blank and tab difference suppression
  • blank line difference suppression
  • brief difference reports
  • bug reports
  • c

  • C function headings
  • C if-then-else output format
  • case difference suppression
  • ClearCase
  • cmp invocation
  • cmp options
  • columnar output
  • common mistakes with patches
  • comparing three files
  • conflict
  • conflict marking
  • context output format
  • creating files
  • d

  • diagnostics from patch
  • diff invocation
  • diff merging
  • diff options
  • diff sample input
  • diff3 hunks
  • diff3 invocation
  • diff3 options
  • diff3 sample input
  • directories and patch
  • dry runs for patch
  • e

  • ed script output format
  • EDITOR
  • empty files, removing
  • exabyte, definition of
  • exbibyte, definition of
  • f

  • FDL, GNU Free Documentation License
  • file name alternates
  • format of diff output
  • format of diff3 output
  • formats for if-then-else line groups
  • forward ed script output format
  • full lines
  • function headings, C
  • fuzz factor when patching
  • g

  • gibibyte, definition of
  • gigabyte, definition of
  • h

  • headings
  • hunks
  • hunks for diff3
  • i

  • if-then-else output format
  • ifdef output format
  • imperfect patch application
  • incomplete line merging
  • incomplete lines
  • inexact patches
  • inhibit messages from patch
  • interactive merging
  • introduction
  • intuiting file names from patches
  • invoking cmp
  • invoking diff
  • invoking diff3
  • invoking patch
  • invoking sdiff
  • k

  • keyboard input to patch
  • kibibyte, definition of
  • kilobyte, definition of
  • l

  • LC_COLLATE
  • LC_NUMERIC
  • LC_TIME
  • line formats
  • line group formats
  • m

  • mebibyte, definition of
  • megabyte, definition of
  • merge commands
  • merged diff3 format
  • merged output format
  • merging from a common ancestor
  • merging interactively
  • messages from patch
  • multiple patches
  • n

  • newline treatment by diff
  • normal output format
  • o

  • options for cmp
  • options for diff
  • options for diff3
  • options for patch
  • options for sdiff
  • output formats
  • overlap
  • overlapping change, selection of
  • overview of diff and patch
  • p

  • paginating diff output
  • patch consumer tips
  • patch input format
  • patch invocation
  • patch messages and questions
  • patch options
  • patch producer tips
  • patch, common mistakes
  • PATCH_GET
  • PATCH_VERSION_CONTROL
  • patches, shrinking
  • patching directories
  • pebibyte, definition of
  • performance of diff
  • petabyte, definition of
  • POSIX, POSIX
  • POSIXLY_CORRECT, POSIXLY_CORRECT
  • q

  • quoting style
  • QUOTING_STYLE
  • r

  • RCS
  • RCS script output format
  • regular expression matching headings
  • regular expression suppression
  • reject file names
  • removing empty files
  • reporting bugs
  • reversed patches
  • revision control
  • s

  • sample input for diff
  • sample input for diff3
  • SCCS
  • script output formats
  • sdiff invocation
  • sdiff options
  • sdiff output format
  • section headings
  • side by side
  • side by side format
  • SIMPLE_BACKUP_SUFFIX
  • specified headings
  • summarizing which files differ
  • System V diff3 compatibility
  • t

  • tab and blank difference suppression
  • tab stop alignment
  • tebibyte, definition of
  • terabyte, definition of
  • testing patch
  • text versus binary diff
  • time stamp format, context diffs
  • time stamp format, unified diffs
  • time stamps on patched files
  • traditional patch
  • two-column output
  • u

  • unified output format
  • unmerged change
  • v

  • verbose messages from patch
  • version control
  • VERSION_CONTROL, VERSION_CONTROL
  • w

  • white space in patches
  • y

  • yottabyte, definition of
  • z

  • zettabyte, definition of

  • ISBN 0954161750Comparing and Merging Files with GNU diff and patchSee the print edition