Download Debian reference guide (23 Feb 2010)
Transcript
Debian Reference 215 / 265 command package diff(1) diff diff3(1) diff vimdiff(1) vim patch(1) patch dpatch(1) dpatch diffstat(1) diffstat combinediff(1) patchutils dehtmldiff(1) patchutils filterdiff(1) patchutils fixcvsdiff(1) patchutils flipdiff(1) patchutils grepdiff(1) patchutils interdiff(1) patchutils lsdiff(1) patchutils recountdiff(1) patchutils rediff(1) patchutils splitdiff(1) patchutils unwrapdiff(1) patchutils wiggle(1) wiggle quilt(1) quilt meld(1) meld xxdiff(1) xxdiff dirdiff(1) dirdiff docdiff(1) docdiff imediff2(1) imediff2 makepatch(1) makepatch applypatch(1) makepatch wdiff(1) wdiff popcon @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ @-@popcon2@@ size description @-@psize2@-@ compare files line by line @-@psize2@-@ compare and merges three files line by line @-@psize2@-@ compare 2 files side by side in vim @-@psize2@-@ apply a diff file to an original @-@psize2@-@ manage series of patches for Debian package @-@psize2@-@ produce a histogram of changes by the diff @-@psize2@-@ create a cumulative patch from two incremen @-@psize2@-@ extract a diff from an HTML page @-@psize2@-@ extract or excludes diffs from a diff file @-@psize2@-@ fix diff files created by CVS that patch(1) m @-@psize2@-@ exchange the order of two patches @-@psize2@-@ show which files are modified by a patch ma @-@psize2@-@ show differences between two unified diff fil @-@psize2@-@ show which files are modified by a patch @-@psize2@-@ recompute counts and offsets in unified conte @-@psize2@-@ fix offsets and counts of a hand-edited diff @-@psize2@-@ separate out incremental patches @-@psize2@-@ demangle patches that have been word-wrap @-@psize2@-@ apply rejected patches @-@psize2@-@ manage series of patches @-@psize2@-@ compare and merge files (GTK) @-@psize2@-@ compare and merge files (plain X) @-@psize2@-@ display differences and merge changes betwe @-@psize2@-@ compare two files word by word / char by ch @-@psize2@-@ interactive full screen 2-way merge tool @-@psize2@-@ generate extended patch files @-@psize2@-@ apply extended patch files @-@psize2@-@ display word differences between text files Table 10.15: List of source code merge tools