File: patchutils.xml

package info (click to toggle)
patchutils 0.4.2-1
  • links: PTS
  • area: main
  • in suites: bullseye, sid
  • size: 1,248 kB
  • sloc: ansic: 6,181; sh: 6,143; xml: 2,750; perl: 409; makefile: 248; python: 23
file content (3158 lines) | stat: -rw-r--r-- 96,164 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
<?xml version='1.0'?> <!-- -*- xml -*- -->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<book>
  <bookinfo>
    <title>Patchutils</title>
  </bookinfo>

  <reference>
    <referenceinfo>
      <author>
	<firstname>Tim</firstname>
	<surname>Waugh</surname>
	<affiliation>
	  <address><email>twaugh@redhat.com</email></address>
	</affiliation>
	<contrib>Package maintainer</contrib>
      </author>
    </referenceinfo>

    <title>Man pages</title>
    <refentry id="interdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>23 June 2009</date>
	<editor>
	  <firstname>Michael K.</firstname>
	  <surname>Johnson</surname>
	  <affiliation>
	    <address><email>johnsonm@redhat.com</email></address>
	  </affiliation>
	  <contrib>Original man page contributor</contrib>
	</editor>
      </refentryinfo>

      <refmeta>
	<refentrytitle>interdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>interdiff</refname>
	<refpurpose>show differences between two diff files</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>interdiff</command>
	  <group choice="opt">
	    <arg>-p <replaceable>n</replaceable></arg>
	    <arg>--strip-match=<replaceable>n</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-U <replaceable>n</replaceable></arg>
	    <arg>--unified=<replaceable>n</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-d <replaceable>PAT</replaceable></arg>
	    <arg>--drop-context=<replaceable>PAT</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-q</arg>
	    <arg>--quiet</arg>
	  </group>
	  <group choice="opt">
	    <arg>-z</arg>
	    <arg>--decompress</arg>
	  </group>
	  <group choice="opt">
	    <arg>-b</arg>
	    <arg>--ignore-space-change</arg>
	  </group>
	  <group choice="opt">
	    <arg>-B</arg>
	    <arg>--ignore-blank-lines</arg>
	  </group>
	  <group choice="opt">
	    <arg>-i</arg>
	    <arg>--ignore-case</arg>
	  </group>
	  <group choice="opt">
	    <arg>-w</arg>
	    <arg>--ignore-all-space</arg>
	  </group>
	  <group choice="opt">
	    <arg>--interpolate</arg>
	    <arg>--combine</arg>
	    <arg>--flip</arg>
	  </group>
	  <arg choice="opt">--no-revert-omitted</arg>
	  <arg choice="plain"><replaceable>diff1</replaceable></arg>
	  <arg choice="plain"><replaceable>diff2</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>interdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para><command>interdiff</command> creates a unified format
          diff that expresses the difference between two diffs.  The
          diffs must both be relative to the same files.  For best
          results, the diffs must have at least three lines of
          context.</para>

	<para>To reverse a patch, use <filename>/dev/null</filename>
	  for <replaceable>diff2</replaceable>.</para>

	<para>To reduce the amount of context in a patch, use:

<screen><![CDATA[interdiff -U1 /dev/null patchfile]]></screen></para>

	<para>Since <command>interdiff</command> doesn't have the
	  advantage of being able to look at the files that are to be
	  modified, it has stricter requirements on the input format
	  than <citerefentry>
	    <refentrytitle>patch</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry> does.  The output of GNU diff will be okay,
	  even with extensions, but if you intend to use a hand-edited
	  patch it might be wise to clean up the offsets and counts
	  using <citerefentry>
	    <refentrytitle>recountdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry> first.</para>

	<para>Note, however, that the two patches must both be
	  relative to the versions of the same original set of
	  files.</para>

	<para>The diffs may be in context format.  The output,
	  however, will be in unified format.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-h</option></term>
	    <listitem>
	      <para>Ignored, for compatibility with older versions of
                interdiff.  This option will go away soon.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable>,
	    <option>--strip-match=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>When comparing filenames, ignore the first
                <replaceable>n</replaceable> pathname components from
                both patches. (This is similar to the
                <option>-p</option> option to GNU <citerefentry>
		  <refentrytitle>patch</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry>.)</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-q</option>, <option>--quiet</option></term>
	    <listitem>
	      <para>Quieter output.  Don't emit rationale lines at the
	       beginning of each patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-U</option> <replaceable>n</replaceable>,
	    <option>--unified=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>Attempt to display <replaceable>n</replaceable>
                lines of context (requires at least
                <replaceable>n</replaceable> lines of context in both
                input files). (This is similar to the
                <option>-U</option> option to GNU
                <citerefentry>
		  <refentrytitle>diff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry>.)</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-d</option> <replaceable>PATTERN</replaceable>,
	    <option>--drop-context=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Don't display any context on files that match the
                shell wildcard <replaceable>PATTERN</replaceable>.
                This option can be given multiple times.</para>

	      <para>Note that the interpretation of the shell wildcard
	        pattern does not count slash characters or periods as
	        special (in other words, no flags are given to
	        <function>fnmatch</function>).  This is so that
	        <quote>*/basename</quote>-type patterns can be given
	        without limiting the number of pathname
	        components.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-i</option>, <option>--ignore-case</option></term>
	    <listitem>
	      <para>Consider upper- and lower-case to be the same.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-w</option>,
	    <option>--ignore-all-space</option></term>
	    <listitem>
	      <para>Ignore whitespace changes in patches.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-b</option>,
	    <option>--ignore-space-change</option></term>
	    <listitem>
	      <para>Ignore changes in the amount of whitespace.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-B</option>,
	    <option>--ignore-blank-lines</option></term>
	    <listitem>
	      <para>Ignore changes whose lines are all blank.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-z</option>,
	    <option>--decompress</option></term>
	    <listitem>
	      <para>Decompress files with extensions .gz and .bz2.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--interpolate</option></term>
	    <listitem>
	      <para>Run as <quote>interdiff</quote>.  This is the
 	        default.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--combine</option></term>
	    <listitem>
	      <para>Run as <quote>combinediff</quote>.  See
	      <citerefentry>
		  <refentrytitle>combinediff</refentrytitle>
		  <manvolnum>1</manvolnum> </citerefentry> for more
		  information about how the behaviour is altered in
		  this mode.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--no-revert-omitted</option></term>
	    <listitem>
	      <para>(For interpolation mode only)  When a file is
	        changed by the first patch but not by the second,
	        don't revert that change.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of interdiff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Examples</title>

	<para>Basic usage:

<screen><![CDATA[interdiff -z 3.2pre1.patch.gz 3.2pre2.patch.gz]]></screen></para>
	<para>Reversing a patch:

<screen><![CDATA[interdiff patch /dev/null]]></screen></para>

	<para>Reversing part of a patch (and ignoring the
	  rest):

<screen><![CDATA[filterdiff -i file.c patchfile | \
  interdiff /dev/stdin /dev/null]]></screen></para>

      </refsect1>

      <refsect1>
	<title>Bugs</title>

	<para>There are currently no known bugs in interdiff; but
          there are some caveats.  If you find a bug, please report it
          (along with a minimal test case) to Tim Waugh
          <email>twaugh@redhat.com</email>.</para>

	<para>There are some sets of patches in which there is just
	  not enough information to produce a proper interdiff.  In
	  this case, the strategy employed is to revert the original
	  patch and apply the new patch.  This, unfortunately, means
	  that interdiffs are not guaranteed to be reversible.</para>

      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>combinediff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="combinediff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>23 Jan 2009</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>combinediff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>combinediff</refname>
	<refpurpose>create a cumulative unified patch from two incremental
	  patches</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>combinediff</command>
	  <group choice="opt">
	    <arg>-p <replaceable>n</replaceable></arg>
	    <arg>--strip-match=<replaceable>n</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-U <replaceable>n</replaceable></arg>
	    <arg>--unified=<replaceable>n</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-d <replaceable>PAT</replaceable></arg>
	    <arg>--drop-context=<replaceable>PAT</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-q</arg>
	    <arg>--quiet</arg>
	  </group>
	  <group choice="opt">
	    <arg>-z</arg>
	    <arg>--decompress</arg>
	  </group>
	  <group choice="opt">
	    <arg>-b</arg>
	    <arg>--ignore-space-change</arg>
	  </group>
	  <group choice="opt">
	    <arg>-B</arg>
	    <arg>--ignore-blank-lines</arg>
	  </group>
	  <group choice="opt">
	    <arg>-i</arg>
	    <arg>--ignore-case</arg>
	  </group>
	  <group choice="opt">
	    <arg>-w</arg>
	    <arg>--ignore-all-space</arg>
	  </group>
	  <group choice="opt">
	    <arg>--interpolate</arg>
	    <arg>--combine</arg>
	  </group>
	  <arg choice="plain"><replaceable>diff1</replaceable></arg>
	  <arg choice="plain"><replaceable>diff2</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>combinediff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>combinediff creates a unified diff that expresses the
          sum of two diffs.  The diff files must be listed in the
          order that they are to be applied.  For best results, the
          diffs must have at least three lines of context.</para>

	<para>Since <command>combinediff</command> doesn't have the
	  advantage of being able to look at the files that are to be
	  modified, it has stricter requirements on the input format
	  than <citerefentry>
	    <refentrytitle>patch</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry> does.  The output of GNU diff will be okay,
	  even with extensions, but if you intend to use a hand-edited
	  patch it might be wise to clean up the offsets and counts
	  using <citerefentry>
	    <refentrytitle>recountdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry> first.</para>

	<para>Note, however, that the two patches must be in strict
	incremental order.  In other words, the second patch must be
	relative to the state of the original set of files after the
	first patch was applied.</para>

	<para>The diffs may be in context format.  The output,
	  however, will be in unified format.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable>,
	    <option>--strip-match=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>When comparing filenames, ignore the first
                <replaceable>n</replaceable> pathname components from
                both patches. (This is similar to the
                <option>-p</option> option to GNU <citerefentry>
		  <refentrytitle>patch</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry>.)</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-q</option>, <option>--quiet</option></term>
	    <listitem>
	      <para>Quieter output.  Don't emit rationale lines at the
	       beginning of each patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-U</option> <replaceable>n</replaceable>,
	    <option>--unified=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>Attempt to display <replaceable>n</replaceable>
                lines of context (requires at least
                <replaceable>n</replaceable> lines of context in both
                input files). (This is similar to the
                <option>-U</option> option to GNU
                <citerefentry>
		  <refentrytitle>diff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry>.)</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-d</option> <replaceable>pattern</replaceable>,
	    <option>--drop-context=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Don't display any context on files that match the
                shell wildcard <replaceable>pattern</replaceable>.
                This option can be given multiple times.</para>

	      <para>Note that the interpretation of the shell wildcard
	        pattern does not count slash characters or periods as
	        special (in other words, no flags are given to
	        <function>fnmatch</function>).  This is so that
	        <quote>*/basename</quote>-type patterns can be given
	        without limiting the number of pathname
	        components.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-i</option>, <option>--ignore-case</option></term>
	    <listitem>
	      <para>Consider upper- and lower-case to be the same.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-w</option>,
	    <option>--ignore-all-space</option></term>
	    <listitem>
	      <para>Ignore whitespace changes in patches.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-b</option>,
	    <option>--ignore-space-change</option></term>
	    <listitem>
	      <para>Ignore changes in the amount of whitespace.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-B</option>,
	    <option>--ignore-blank-lines</option></term>
	    <listitem>
	      <para>Ignore changes whose lines are all blank.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-z</option>,
	    <option>--decompress</option></term>
	    <listitem>
	      <para>Decompress files with extensions .gz and .bz2.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--interpolate</option></term>
	    <listitem>
	      <para>Run as <quote>interdiff</quote>.  See
	      <citerefentry>
		  <refentrytitle>interdiff</refentrytitle>
		  <manvolnum>1</manvolnum> </citerefentry> for more
		  information about how the behaviour is altered in
		  this mode.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--combine</option></term>
	    <listitem>
	      <para>Run as <quote>combinediff</quote>.  This is the
 	        default.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of combinediff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Bugs</title>

	<para>The <option>-U</option> option is a bit erratic: it can
          control the amount of context displayed for files that are
          modified in both patches, but not for files that only appear
          in one patch (which appear with the same amount of context
          in the output as in the input).</para>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>interdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="filterdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>23 Jan 2009</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>filterdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>filterdiff</refname>
	<refpurpose>extract or exclude diffs from a diff file</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>filterdiff</command>
	  <group choice="opt">
	    <arg>-i <replaceable>PATTERN</replaceable></arg>
	    <arg>--include=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-I <replaceable>FILE</replaceable></arg>
	    <arg>--include-from-file=<replaceable>FILE</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-p <replaceable>n</replaceable></arg>
	    <arg>--strip-match=<replaceable>n</replaceable></arg>
	  </group>
	  <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
	  <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
	  <arg choice="opt">--addoldprefix=<replaceable>PREFIX</replaceable></arg>
	  <arg choice="opt">--addnewprefix=<replaceable>PREFIX</replaceable></arg>
	  <group choice="opt">
	    <arg>-x <replaceable>PATTERN</replaceable></arg>
	    <arg>--exclude=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-X <replaceable>FILE</replaceable></arg>
	    <arg>--exclude-from-file=<replaceable>FILE</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-v</arg>
	    <arg>--verbose</arg>
	  </group>
	  <arg choice="opt">--clean</arg>
	  <group choice="opt">
	    <arg>-z</arg>
	    <arg>--decompress</arg>
	  </group>
	  <group choice="opt">
	    <arg>-# <replaceable>RANGE</replaceable></arg>
	    <arg>--hunks=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <arg choice="opt">--lines=<replaceable>RANGE</replaceable></arg>
	  <group choice="opt">
	    <arg>-F<replaceable>RANGE</replaceable></arg>
	    <arg>--files=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <arg choice="opt">--annotate</arg>
	  <arg choice="opt">--format=<replaceable>FORMAT</replaceable></arg>
	  <arg choice="opt">--as-numbered-lines=<replaceable>WHEN</replaceable></arg>
	  <arg choice="opt">--remove-timestamps</arg>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>filterdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	    <arg>--list</arg>
	    <arg>--grep ...</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>You can use filterdiff to obtain a patch that applies to
          files matching the shell wildcard
          <replaceable>PATTERN</replaceable> from a larger collection
          of patches.  For example, to see the patches in
          <filename>patch-2.4.3.gz</filename> that apply to all files
          called <filename>lp.c</filename>:

	<screen>filterdiff -z -i '*/lp.c' patch-2.4.3.gz</screen></para>

	<para>If neither <option>-i</option> nor <option>-x</option>
	options are given, <option>-i '*'</option> is assumed.  This
	way <command>filterdiff</command> can be used to clean up an
	existing diff file, removing redundant lines from the
	beginning (eg. the text from the mail body) or between the
	chunks (eg. in CVS diffs). To extract pure patch data, use a
	command like this:

	<screen>filterdiff message-with-diff-in-the-body > patch</screen></para>

	<para>Note that the interpretation of the shell wildcard
	  pattern does not count slash characters or periods as
	  special (in other words, no flags are given to
	  <function>fnmatch</function>).  This is so that
	  <quote>*/basename</quote>-type patterns can be given without
	  limiting the number of pathname components.</para>

	<para>You can use both unified and context format diffs with
	  this program.</para>

      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-i</option> <replaceable>PATTERN</replaceable>,
	    <option>--include=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Include only files matching
	        <replaceable>PATTERN</replaceable>.  All other lines
	        in the input are suppressed.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-I</option> <replaceable>FILE</replaceable>,
	    <option>--include-from-file=<replaceable>FILE</replaceable></option></term>
	    <listitem>
	      <para>Include only files matching any pattern listed in
	        <replaceable>FILE</replaceable>, one pattern per line.
		All other lines in the input are suppressed.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-x</option> <replaceable>PATTERN</replaceable>,
	    <option>--exclude=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Exclude files matching
	        <replaceable>PATTERN</replaceable>.  All other lines
	        in the input are displayed.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-X</option> <replaceable>FILE</replaceable>,
	    <option>--exclude-from-file=<replaceable>FILE</replaceable></option></term>
	    <listitem>
	      <para>Exclude files matching any pattern listed in
	        <replaceable>FILE</replaceable>, one pattern per line.
	        All other lines in the input are displayed.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable>,
	    <option>--strip-match=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>When matching, ignore the first
	        <replaceable>n</replaceable> components of the
	        pathname.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-#</option> <replaceable>RANGE</replaceable>,
	    <option>--hunks</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only include hunks within the specified
	        <replaceable>RANGE</replaceable>.  Hunks are numbered
	        from 1, and the range is a comma-separated list of
	        numbers or <quote>first-last</quote> spans,
		optionally preceded by a modifier 'x' which inverts
		the entire range; either the first or the last in the
		span may be omitted to indicate no limit in that
	        direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--lines</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only include hunks that contain lines from the
	        original file that lie within the specified
	        <replaceable>RANGE</replaceable>.  Lines are numbered
	        from 1, and the range is a comma-separated list of
	        numbers or <quote>first-last</quote> spans,
		optionally preceded by a modifier 'x' which inverts
		the entire range; either the first or the last in the
		span may be omitted to indicate no limit in that
	        direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-F</option>=<replaceable>RANGE</replaceable>,
	    <option>--files</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only include files indicated by the specified
	        <replaceable>RANGE</replaceable>.  Files are numbered
	        from 1 in the order they appear in the patch input,
	        and the range is a comma-separated list of numbers or
	        <quote>first-last</quote> spans, optionally preceded
	        by a modifier 'x' which inverts the entire range; either the
	        first or the last in the span may be omitted to indicate no
	        limit in that direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--annotate</option></term>

	    <listitem>
	      <para>Annotate each hunk with the filename and hunk
	        number.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--format</option>=unified|context</term>

	    <listitem>
	      <para>Use specified output format.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--strip</option>=<replaceable>n</replaceable></term>
	    <listitem>
	      <para>Remove the first <replaceable>n</replaceable>
	        components of pathnames in the output.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix pathnames in the output by
	        <replaceable>PREFIX</replaceable>.  This will override
	        any individual settings specified with
	        the <option>--addoldprefix</option>
	        or <option>--addnewprefix</option> options.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addoldprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix pathnames for old or original files in the
	      output by <replaceable>PREFIX</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addnewprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix pathnames for updated or new files in the
	      output by <replaceable>PREFIX</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--as-numbered-lines</option>=before|after</term>
	    <listitem>
	      <para>Instead of a patch fragment, display the lines of
	        the selected hunks with the line number of the file
	        before (or after) the patch is applied, followed by a
	        <keycode>TAB</keycode> character and a colon, at the
	        beginning of each line.  Each hunk except the first
	        will have a line consisting of <quote>...</quote>
	        before it.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--remove-timestamps</option></term>

	    <listitem>
	      <para>Do not include file timestamps in the
	        output.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-v</option>, <option>--verbose</option></term>
	    <listitem>
	      <para>Always show non-diff lines in the output.  By
	        default, non-diff lines are only shown when excluding
	        a filename pattern.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--clean</option></term>
	    <listitem>
	      <para>Always remove all non-diff lines from the
	        output. Even when excluding a filename pattern.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-z</option>, <option>--decompress</option></term>
	    <listitem>
	      <para>Decompress files with extensions .gz and .bz2.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of filterdiff.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--list</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>lsdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--grep</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>grepdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Examples</title>

	<para>To see all patch hunks that affect the first five lines
	  of a C file:

<screen><![CDATA[filterdiff -i '*.c' --lines=-5 < patch]]></screen></para>

	<para>To see the first hunk of each file patch, use:

<screen><![CDATA[filterdiff -#1 patchfile]]></screen></para>

	<para>To see patches modifying a ChangeLog file in a
	  subdirectory, use:

<screen><![CDATA[filterdiff -p1 Changelog]]></screen></para>

	<para>To see the complete patches for each patch that modifies
	  line 1 of the original file, use:

<screen><![CDATA[filterdiff --lines=1 patchfile | lsdiff | \
  xargs -rn1 filterdiff patchfile -i]]></screen></para>

	<para>To see all but the first hunk of a particular patch, you
	  might use:

<screen><![CDATA[filterdiff -p1 -i file.c -#2- foo-patch]]></screen></para>

	<para>If you have a very specific list of hunks in a patch
	  that you want to see, list them:

<screen><![CDATA[filterdiff -#1,2,5-8,10,12,27-]]></screen></para>

	<para>To see the lines of the files that would be patched as
	  they will appear after the patch is applied, use:

<screen><![CDATA[filterdiff --as-numbered-lines=after patch.file]]></screen></para>

	<para>You can see the same context before the patch is applied
	  with:

<screen><![CDATA[filterdiff --as-numbered-lines=before
patch.file]]></screen></para>

	<para>Filterdiff can also be used to convert between unified
	  and context format diffs:

<screen><![CDATA[filterdiff -v --format=unified context.diff]]></screen></para>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>lsdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>grepdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>patchview</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="fixcvsdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>7 Dec 2001</date>
	<authorgroup>
	  <author>
	    <firstname>Amir</firstname>
	    <surname>Karger</surname>
	    <affiliation>
	      <address><email>karger@post.harvard.edu</email></address>
	    </affiliation>
	    <contrib>Author of the original perl script and man page</contrib>
	  </author>

	  <author>
	    <firstname>John</firstname>
	    <surname>Levon</surname>
	    <affiliation>
	      <address><email>moz@compsoc.man.ac.uk</email></address>
	    </affiliation>
	    <contrib>Author of the original perl script and man page</contrib>
	  </author>
	</authorgroup>
      </refentryinfo>

      <refmeta>
	<refentrytitle>fixcvsdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>fixcvsdiff</refname>
	<refpurpose>fix problematic diff files</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>fixcvsdiff</command>
	  <arg choice="opt">-p</arg>
	  <arg choice="opt">-b</arg>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>fixcvsdiff modifies diff files created from the
          <command>cvs diff</command> command, where files have been
          added or removed. CVS tends to create diff files that
          <citerefentry>
	    <refentrytitle>patch</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry> mis-interprets. The diff file must retain the
          lines beginning with <quote>Index:</quote> in order for the
          correction to work.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-b</option></term>
	    <listitem>
	      <para>Keep a .bak backup file.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-p</option></term>
	    <listitem>
	      <para>Print out the <command>cvs add</command> and
                <command>cvs remove</command> commands that must be
                made after applying the diff, but before running
                <command>cvs commit</command>.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>diff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>patch</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>cvs</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="lsdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>23 Jan 2009</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>lsdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>lsdiff</refname>
	<refpurpose>show which files are modified by a patch</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>lsdiff</command>
	  <group choice="opt">
	    <arg>-n</arg>
	    <arg>--line-number</arg>
	  </group>
	  <group choice="opt">
	    <arg>-p <replaceable>n</replaceable></arg>
	    <arg>--strip-match=<replaceable>n</replaceable></arg>
	  </group>
	  <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
	  <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
	  <group choice="opt">
	    <arg>-s</arg>
	    <arg>--status</arg>
	  </group>
	  <group choice="opt">
	    <arg>-E</arg>
	    <arg>--empty-files-as-removed</arg>
	  </group>
	  <group choice="opt">
	    <arg>-i <replaceable>PATTERN</replaceable></arg>
	    <arg>--include=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-x <replaceable>PATTERN</replaceable></arg>
	    <arg>--exclude=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group>
	    <arg>-z</arg>
	    <arg>--decompress</arg>
	  </group>
	  <group choice="opt">
	    <arg>-# <replaceable>RANGE</replaceable></arg>
	    <arg>--hunks=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <arg choice="opt">--lines=<replaceable>RANGE</replaceable></arg>
	  <group choice="opt">
	    <arg>-F<replaceable>RANGE</replaceable></arg>
	    <arg>--files=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-H</arg>
	    <arg>--with-filename</arg>
	  </group>
	  <group choice="opt">
	    <arg>-h</arg>
	    <arg>--no-filename</arg>
	  </group>
	  <group choice="opt" rep="repeat">
	    <arg>-v</arg>
	    <arg>--verbose</arg>
	  </group>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>lsdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	    <arg>--filter ...</arg>
	    <arg>--grep ...</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>List the files modified by a patch.</para>

	<para>You can use both unified and context format diffs with
	  this program.</para>

      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-n</option>, <option>--line-number</option></term>
	    <listitem>
	      <para>Display the line number that each patch begins at.
	        If verbose output is requested (using
	        <option>-nv</option>), each hunk of each patch is
	        listed as well.</para>

	      <para>For each file that is modified, a line is
	        generated containing the line number of the beginning
	        of the patch, followed by a <keycode>Tab</keycode>
	        character, followed by the name of the file that is
	        modified.  If <option>-v</option> is given once,
	        following each of these lines will be one line for
	        each hunk, consisting of a <keycode>Tab</keycode>
	        character, the line number that the hunk begins at,
	        another <keycode>Tab</keycode> character, the string
	        <quote>Hunk #</quote>, and the hunk number (starting
	        at 1).</para>

	      <para>If the <option>-v</option> is given twice in
	        conjunction with <option>-n</option>
	        (i.e. <option>-nvv</option>), the format is slightly
	        different: hunk-level descriptive text
	        is shown after each hunk number, and the
	        <option>--number-files</option> option is
	        enabled.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-N</option>, <option>--number-files</option></term>
	    <listitem>
	      <para>File numbers are listed, beginning at 1, before
	      each filename.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-#</option> <replaceable>RANGE</replaceable>,
	    <option>--hunks</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list hunks within the specified
	        <replaceable>RANGE</replaceable>.  Hunks are numbered
	        from 1, and the range is a comma-separated list of
	        numbers or <quote>first-last</quote> spans,
		optionally preceded by a modifier 'x' which inverts
		the entire range; either the first or the last in the
		span may be omitted to indicate no limit in that
	        direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--lines</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list hunks that contain lines from the
	        original file that lie within the specified
	        <replaceable>RANGE</replaceable>.  Lines are numbered
	        from 1, and the range is a comma-separated list of
	        numbers or <quote>first-last</quote> spans,
		optionally preceded by a modifier 'x' which inverts
		the entire range; either the first or the last in the
		span may be omitted to indicate no limit in that
	        direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-F</option>=<replaceable>RANGE</replaceable>,
	    <option>--files</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list files indicated by the specified
	        <replaceable>RANGE</replaceable>.  Files are numbered
	        from 1 in the order they appear in the patch input,
	        and the range is a comma-separated list of numbers or
	        <quote>first-last</quote> spans, optionally preceded by a
		modifier 'x' which inverts the entire range; either
		the first or the last in the span may be omitted to
	        indicate no limit in that direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable>,
	    <option>--strip-match=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>When matching, ignore the first
	        <replaceable>n</replaceable> components of the
	        pathname.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--strip</option>=<replaceable>n</replaceable></term>
	    <listitem>
	      <para>Remove the first <replaceable>n</replaceable>
	        components of the pathname before displaying
	        it.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix the pathname with
	        <replaceable>PREFIX</replaceable> before displaying
	        it.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-s</option>, <option>--status</option></term>
	    <listitem>
	      <para>Show file additions, modifications and removals.
	       A file addition is indicated by a <quote>+</quote>, a
	       removal by a <quote>-</quote>, and a modification by a
	       <quote>!</quote>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-E</option>,
	    <option>--empty-files-as-removed</option></term>
	    <listitem>
	      <para>Treat empty files as absent for the purpose of
	      displaying file additions, modifications and
	      removals.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-i</option> <replaceable>PATTERN</replaceable>,
	    <option>--include=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Include only files matching
	        <replaceable>PATTERN</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-x</option> <replaceable>PATTERN</replaceable>,
	    <option>--exclude=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Exclude files matching
	        <replaceable>PATTERN</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-z</option>,
	    <option>--decompress</option></term>
	    <listitem>
	      <para>Decompress files with extensions .gz and .bz2.
              </para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-H</option>, <option>--with-filename</option></term>
	    <listitem>
	      <para>Print the name of the patch file containing each
	        patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-h</option>, <option>--no-filename</option></term>
	    <listitem>
	      <para>Suppress the name of the patch file containing each
	        patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-v</option>, <option>--verbose</option></term>
	    <listitem>
	      <para>Verbose output.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of lsdiff.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--filter</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>filterdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--grep</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>grepdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>filterdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>grepdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>patchview</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>

      <refsect1>
	<title>Examples</title>

	<para>To sort the order of touched files in a patch, you can
	  use:

<screen><![CDATA[lsdiff patch | sort -u | \
  xargs -rn1 filterdiff patch -i]]></screen></para>

	<para>To show only added files in a patch:

<screen><![CDATA[lsdiff -s patch | grep '^+' | \
  cut -c2- | xargs -rn1 filterdiff patch -i]]></screen></para>

	<para>To show the headers of all file hunks:

<screen><![CDATA[lsdiff -n patch | (while read n file
  do sed -ne "$n,$(($n+1))p" patch
done)]]></screen></para>
      </refsect1>

    </refentry>
    <refentry id="patchview">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>02 Jul 2020</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>patchview</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>patchview</refname>
	<refpurpose>Without options, show numbered files modified by the patch. With options, behave as filterdiff.</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>patchview</command>
	  <group choice="opt">
	    <arg>-n</arg>
	    <arg>--line-number</arg>
	  </group>
	  <group choice="opt">
	    <arg>-p <replaceable>n</replaceable></arg>
	    <arg>--strip-match=<replaceable>n</replaceable></arg>
	  </group>
	  <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
	  <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
	  <group choice="opt">
	    <arg>-s</arg>
	    <arg>--status</arg>
	  </group>
	  <group choice="opt">
	    <arg>-E</arg>
	    <arg>--empty-files-as-removed</arg>
	  </group>
	  <group choice="opt">
	    <arg>-i <replaceable>PATTERN</replaceable></arg>
	    <arg>--include=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-x <replaceable>PATTERN</replaceable></arg>
	    <arg>--exclude=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group>
	    <arg>-z</arg>
	    <arg>--decompress</arg>
	  </group>
	  <group choice="opt">
	    <arg>-# <replaceable>RANGE</replaceable></arg>
	    <arg>--hunks=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <arg choice="opt">--lines=<replaceable>RANGE</replaceable></arg>
	  <group choice="opt">
	    <arg>-F<replaceable>RANGE</replaceable></arg>
	    <arg>--files=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-H</arg>
	    <arg>--with-filename</arg>
	  </group>
	  <group choice="opt">
	    <arg>-h</arg>
	    <arg>--no-filename</arg>
	  </group>
	  <group choice="opt" rep="repeat">
	    <arg>-v</arg>
	    <arg>--verbose</arg>
	  </group>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>patchview</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	    <arg>--filter ...</arg>
	    <arg>--grep ...</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>So what is patchview? It is a wrapper of filterdiff for use with numbered files.

    <screen>patchview</screen>
    (without args)
    
is equivalent to: lsdiff --number
	</para>
	<para>
    <screen>patchview -F2-</screen>
    (or with any other args)
    
is equivalent to: filterdiff -F2- (or whatever arguments are supplied)
	</para>
	<para>
There are two scripts for working with git (gitdiff and gitdiffview) and two for svn (svndiff and svndiffview).

    <screen>svndiff</screen>
    <screen>gitdiff</screen>
    (without args)
    
will give the list of files modified
	</para>
	<para>
    <screen>svndiff -F1</screen>
    <screen>gitdiff -F1</screen>
    
will show the patch of file #1
	</para>
	<para>
    <screen>svndiffview</screen>
    <screen>gitdiffview</screen>
    
pipe all patches through filterdiff to vim - -R (in read-only mode, easy to quit), showing complete patch with color.
	</para>
	<para>
    <screen>svndiffview -F2</screen>
    <screen>gitdiffview -F2</screen>
    (or any other args)

will pipe patch of file #2 to vim - -R
	</para>

      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-n</option>, <option>--line-number</option></term>
	    <listitem>
	      <para>Display the line number that each patch begins at.
	        If verbose output is requested (using
	        <option>-nv</option>), each hunk of each patch is
	        listed as well.</para>

	      <para>For each file that is modified, a line is
	        generated containing the line number of the beginning
	        of the patch, followed by a <keycode>Tab</keycode>
	        character, followed by the name of the file that is
	        modified.  If <option>-v</option> is given once,
	        following each of these lines will be one line for
	        each hunk, consisting of a <keycode>Tab</keycode>
	        character, the line number that the hunk begins at,
	        another <keycode>Tab</keycode> character, the string
	        <quote>Hunk #</quote>, and the hunk number (starting
	        at 1).</para>

	      <para>If the <option>-v</option> is given twice in
	        conjunction with <option>-n</option>
	        (i.e. <option>-nvv</option>), the format is slightly
	        different: hunk-level descriptive text
	        is shown after each hunk number, and the
	        <option>--number-files</option> option is
	        enabled.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-N</option>, <option>--number-files</option></term>
	    <listitem>
	      <para>File numbers are listed, beginning at 1, before
	      each filename.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-#</option> <replaceable>RANGE</replaceable>,
	    <option>--hunks</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list hunks within the specified
	        <replaceable>RANGE</replaceable>.  Hunks are numbered
	        from 1, and the range is a comma-separated list of
	        numbers or <quote>first-last</quote> spans,
		optionally preceded by a modifier 'x' which inverts
		the entire range; either the first or the last in the
		span may be omitted to indicate no limit in that
	        direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--lines</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list hunks that contain lines from the
	        original file that lie within the specified
	        <replaceable>RANGE</replaceable>.  Lines are numbered
	        from 1, and the range is a comma-separated list of
	        numbers or <quote>first-last</quote> spans,
		optionally preceded by a modifier 'x' which inverts
		the entire range; either the first or the last in the
		span may be omitted to indicate no limit in that
	        direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-F</option>=<replaceable>RANGE</replaceable>,
	    <option>--files</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list files indicated by the specified
	        <replaceable>RANGE</replaceable>.  Files are numbered
	        from 1 in the order they appear in the patch input,
	        and the range is a comma-separated list of numbers or
	        <quote>first-last</quote> spans, optionally preceded by a
		modifier 'x' which inverts the entire range; either
		the first or the last in the span may be omitted to
	        indicate no limit in that direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable>,
	    <option>--strip-match=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>When matching, ignore the first
	        <replaceable>n</replaceable> components of the
	        pathname.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--strip</option>=<replaceable>n</replaceable></term>
	    <listitem>
	      <para>Remove the first <replaceable>n</replaceable>
	        components of the pathname before displaying
	        it.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix the pathname with
	        <replaceable>PREFIX</replaceable> before displaying
	        it.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-s</option>, <option>--status</option></term>
	    <listitem>
	      <para>Show file additions, modifications and removals.
	       A file addition is indicated by a <quote>+</quote>, a
	       removal by a <quote>-</quote>, and a modification by a
	       <quote>!</quote>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-E</option>,
	    <option>--empty-files-as-removed</option></term>
	    <listitem>
	      <para>Treat empty files as absent for the purpose of
	      displaying file additions, modifications and
	      removals.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-i</option> <replaceable>PATTERN</replaceable>,
	    <option>--include=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Include only files matching
	        <replaceable>PATTERN</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-x</option> <replaceable>PATTERN</replaceable>,
	    <option>--exclude=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Exclude files matching
	        <replaceable>PATTERN</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-z</option>,
	    <option>--decompress</option></term>
	    <listitem>
	      <para>Decompress files with extensions .gz and .bz2.
              </para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-H</option>, <option>--with-filename</option></term>
	    <listitem>
	      <para>Print the name of the patch file containing each
	        patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-h</option>, <option>--no-filename</option></term>
	    <listitem>
	      <para>Suppress the name of the patch file containing each
	        patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-v</option>, <option>--verbose</option></term>
	    <listitem>
	      <para>Verbose output.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of patchview.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--filter</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>filterdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--grep</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>grepdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>lsdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>,<citerefentry>
	    <refentrytitle>filterdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>grepdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>

      <refsect1>
	<title>Examples</title>
	<para>We can make the following one-line script with the name difftotrunk.sh, to view the differences of two directories or svn repos (trunk and .)
		<screen><![CDATA[diff ../trunk . -ru -x .svn | patchview "$@"]]></screen></para>
    <para>
		<screen>./difftotrunk.sh , will show all different files and his number.</screen>
		<screen>./difftotrunk.sh -F3,4 , will show the differences of files #3 and #4 only.</screen>
		<screen>./difftotrunk.sh -F3 -#1 , will show only hunk #1 of file #3.</screen>
		<screen>./difftotrunk.sh -F3 -#x1 , will show the differences of files #3 without hunk #1 (x means that exclude). </screen>
    </para>
	 </refsect1>

    </refentry>
    <refentry id="splitdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>4 Nov 2014</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>splitdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>splitdiff</refname>
	<refpurpose>separate out incremental patches</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>splitdiff</command>
	  <arg choice="opt">-a</arg>
	  <arg choice="opt">-d</arg>
	  <arg choice="opt">-D <replaceable>dir</replaceable></arg>
	  <arg choice="opt">-p <replaceable>n</replaceable></arg>
	  <arg choice="opt">-E</arg>
	  <arg choice="opt"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>splitdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>If you have a patch file composed of several incremental
          patches, you can use splitdiff to separate them out.  You
          may want to do this in preparation for re-combining them
          with <citerefentry>
          <refentrytitle>combinediff</refentrytitle>
          <manvolnum>1</manvolnum></citerefentry>.</para>

	<para>The effect of running splitdiff is to separate its input
	  into a set of output files, with no output file patching the
	  same file more than once.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-a</option></term>
	    <listitem>
	      <para>Split out every single file-level patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-d</option></term>
	    <listitem>
	      <para>Create file names such as
	      <filename>a_b.c.patch</filename> for a patch that
	      modifies <filename>a/b.c</filename>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-D</option>
	    <replaceable>dir</replaceable></term>
	    <listitem>
	      <para>Write output files into subdirectory
	      <replaceable>dir</replaceable>. Implies
	      <option>-d</option>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable></term>
	    <listitem>
	      <para>Strip the first <replaceable>n</replaceable>
	        components of the pathname to aid comparisons.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-E</option></term>
	    <listitem>
	      <para>Don't use .patch filename extension when writing
	      output files.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of splitdiff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>combinediff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>lsdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="rediff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>13 May 2002</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>rediff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>rediff</refname>
	<refname>editdiff</refname>
	<refpurpose>fix offsets and counts of a hand-edited diff</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>rediff</command>
	  <arg choice="plain"><replaceable>ORIGINAL</replaceable></arg>
	  <arg choice="plain"><replaceable>EDITED</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>rediff</command>
	  <arg choice="plain"><replaceable>EDITED</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>rediff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>editdiff</command>
	  <arg choice="plain"><replaceable>FILE</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>editdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>You can use rediff to correct a hand-edited unified
          diff.  Take a copy of the diff you want to edit, and edit it
          without changing any offsets or counts (the lines that begin
          <quote>@@</quote>).  Then run rediff, telling it the name of
          the original diff file and the name of the one you have
          edited, and it will output the edited diff file but with
          corrected offsets and counts.</para>

	<para>A small script, editdiff, is provided for editing a diff
          file in-place.</para>

	<para>The types of changes that are currently handled
	  are:

	<itemizedlist>
	    <listitem>
	      <para>Modifying the text of any file content line (of
	        course).</para>
	    </listitem>

	    <listitem>
	      <para>Adding new line insertions or deletions.</para>
	    </listitem>

	    <listitem>
	      <para>Adding, changing or removing context lines.  Lines
	        at the context horizon are dealt with by adjusting the
	        offset and/or count.</para>
	    </listitem>

	    <listitem>
	      <para>Adding a single hunk (@@-prefixed section).</para>
	    </listitem>

	    <listitem>
	      <para>Removing multiple hunk (@@-prefixed
	        sections).</para>
	    </listitem>
	  </itemizedlist></para>

	<para>Alternatively, if only one argument is provided, it is
	  taken to be the edited file and the counts and offsets are
	  adjusted as appropriate.  Some assumptions are made when
	  used in this mode.  See <citerefentry>
	    <refentrytitle>recountdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry> for more information.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of rediff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>interdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>recountdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="grepdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>10 Feb 2011</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>grepdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>grepdiff</refname>
	<refpurpose>show files modified by a diff containing a
          regex</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>grepdiff</command>
	  <group choice="opt">
	    <arg>-n</arg>
	    <arg>--line-number</arg>
	  </group>
	  <group choice="opt">
	    <arg>-N</arg>
	    <arg>--number-files</arg>
	  </group>
	  <group choice="opt">
	    <arg>-p <replaceable>n</replaceable></arg>
	    <arg>--strip-match=<replaceable>n</replaceable></arg>
	  </group>
	  <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
	  <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
	  <arg choice="opt">--addoldprefix=<replaceable>PREFIX</replaceable></arg>
	  <arg choice="opt">--addnewprefix=<replaceable>PREFIX</replaceable></arg>
	  <group choice="opt">
	    <arg>-s</arg>
	    <arg>--status</arg>
	  </group>
	  <group choice="opt">
	    <arg>-i <replaceable>PATTERN</replaceable></arg>
	    <arg>--include=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-I <replaceable>FILE</replaceable></arg>
	    <arg>--include-from-file=<replaceable>FILE</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-x <replaceable>PATTERN</replaceable></arg>
	    <arg>--exclude=<replaceable>PATTERN</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-X <replaceable>FILE</replaceable></arg>
	    <arg>--exclude-from-file=<replaceable>FILE</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-# <replaceable>RANGE</replaceable></arg>
	    <arg>--hunks=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <arg choice="opt">--lines=<replaceable>RANGE</replaceable></arg>
	  <group choice="opt">
	    <arg>-F<replaceable>RANGE</replaceable></arg>
	    <arg>--files=<replaceable>RANGE</replaceable></arg>
	  </group>
	  <arg choice="opt">--annotate</arg>
	  <arg choice="opt">--as-numbered-lines=<replaceable>WHEN</replaceable></arg>
	  <arg choice="opt">--format=<replaceable>FORMAT</replaceable></arg>
	  <arg choice="opt">--remove-timestamps</arg>
	  <group choice="opt">
	    <arg>-v</arg>
	    <arg>--verbose</arg>
	  </group>
	  <group choice="opt">
	    <arg>-z</arg>
	    <arg>--decompress</arg>
	  </group>
	  <group choice="opt">
	    <arg>-E</arg>
	    <arg>--extended-regexp</arg>
	  </group>
	  <group choice="opt">
	    <arg>-H</arg>
	    <arg>--with-filename</arg>
	  </group>
	  <group choice="opt">
	    <arg>-h</arg>
	    <arg>--no-filename</arg>
	  </group>
	  <arg choice="opt">--output-matching=<replaceable>WHAT</replaceable></arg>
	  <arg choice="opt">--only-match=<replaceable>WHAT</replaceable></arg>
	  <group choice="req">
	    <arg><replaceable>REGEX</replaceable></arg>
	    <arg>-f <replaceable>FILE</replaceable></arg>
	  </group>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>grepdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	    <arg>--list</arg>
	    <arg>--filter ...</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para>For each file modified by a patch, if the patch hunk
	  contains the <replaceable>REGEX</replaceable> then the
	  file's name is printed.</para>

	<para>The regular expression is treated as POSIX Basic Regular
	  Expression syntax, unless the <option>-E</option> option is
	  given in which case POSIX Extended Regular Expression syntax
	  is used.</para>

	<para>For example, to see the patches in
	  <filename>my.patch</filename> which contain the regular
	  expression <quote>pf_gfp_mask</quote>, use:

<screen><![CDATA[grepdiff pf_gfp_mask my.patch | \
  xargs -rn1 filterdiff my.patch -i]]></screen></para>

	<para>You can use both unified and context format diffs with
	  this program.</para>

      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-n</option>, <option>--line-number</option></term>
	    <listitem>
	      <para>Display the line number that each patch begins at.
	        If verbose output is requested, each matching hunk is
	        listed as well.</para>

	      <para>For a description of the output format see
	        <citerefentry>
		  <refentrytitle>lsdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-N</option>, <option>--number-files</option></term>
	    <listitem>
	      <para>File numbers are listed, beginning at 1, before
	      each filename.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable>,
	    <option>--strip-match=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>When matching, ignore the first
	        <replaceable>n</replaceable> components of the
	        pathname.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--strip</option>=<replaceable>n</replaceable></term>
	    <listitem>
	      <para>Remove the first <replaceable>n</replaceable>
	        components of the pathname before displaying
	        it.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix the pathname with
	      <replaceable>PREFIX</replaceable> before displaying it.
	      This will override any individual settings specified
	      with the <option>--addoldprefix</option> or
	      <option>--addnewprefix</option> options.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addoldprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix pathnames for old or original files in the
	      output by <replaceable>PREFIX</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--addnewprefix</option>=<replaceable>PREFIX</replaceable></term>
	    <listitem>
	      <para>Prefix pathnames for updated or new files in the
	      output by <replaceable>PREFIX</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-s</option></term>
	    <listitem>
	      <para>Show file additions, modifications and removals.
	       A file addition is indicated by a <quote>+</quote>, a
	       removal by a <quote>-</quote>, and a modification by a
	       <quote>!</quote>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-i</option> <replaceable>PATTERN</replaceable>,
	    <option>--include=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Include only files matching
	        <replaceable>PATTERN</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-I</option> <replaceable>FILE</replaceable>,
	    <option>--include-from-file=<replaceable>FILE</replaceable></option></term>
	    <listitem>
	      <para>Include only files matching any pattern listed in
	        <replaceable>FILE</replaceable>, one pattern per line.
		All other lines in the input are suppressed.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-x</option> <replaceable>PATTERN</replaceable>
	    <option>--exclude=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Exclude files matching
	        <replaceable>PATTERN</replaceable>.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-X</option> <replaceable>FILE</replaceable>,
	    <option>--exclude-from-file=<replaceable>FILE</replaceable></option></term>
	    <listitem>
	      <para>Exclude files matching any pattern listed in
	        <replaceable>FILE</replaceable>, one pattern per line.
	        All other lines in the input are displayed.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-#</option> <replaceable>RANGE</replaceable>,
	    <option>--hunks</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only include hunks within the specified
	      <replaceable>RANGE</replaceable>.  Hunks are numbered
	      from 1, and the range is a comma-separated list of
	      numbers or <quote>first-last</quote> spans, optionally
	      preceded by a modifier 'x' which inverts the entire
	      range; either the first or the last in the span may be
	      omitted to indicate no limit in that direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--lines</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list hunks that contain lines from the
	        original file that lie within the specified
	        <replaceable>RANGE</replaceable>.  Lines are numbered
	        from 1, and the range is a comma-separated list of
	        numbers or <quote>first-last</quote> spans,
		optionally preceded by a modifier 'x' which inverts
		the entire range; either the first or the last in the
		span may be omitted to indicate no limit in that
	        direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-F</option>=<replaceable>RANGE</replaceable>,
	    <option>--files</option>=<replaceable>RANGE</replaceable></term>
	    <listitem>
	      <para>Only list files indicated by the specified
	        <replaceable>RANGE</replaceable>.  Files are numbered
	        from 1 in the order they appear in the patch input,
	        and the range is a comma-separated list of numbers or
	        <quote>first-last</quote> spans, optionally preceded by a
	        modifier 'x' which inverts the entire range; either
		the first or the last in the span may be omitted to
		indicate no limit in that direction.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--annotate</option></term>

	    <listitem>
	      <para>Annotate each hunk with the filename and hunk
	        number.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--as-numbered-lines</option>=before|after</term>
	    <listitem>
	      <para>Instead of a patch fragment, display the lines of
	        the selected hunks with the line number of the file
	        before (or after) the patch is applied, followed by a
	        <keycode>TAB</keycode> character and a colon, at the
	        beginning of each line.  Each hunk except the first
	        will have a line consisting of <quote>...</quote>
	        before it.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--format</option>=unified|context</term>

	    <listitem>
	      <para>Use specified output format.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--remove-timestamps</option></term>

	    <listitem>
	      <para>Do not include file timestamps in the
	        output.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-z</option>,
	    <option>--decompress</option></term>
	    <listitem>
	      <para>Decompress files with extensions .gz and .bz2.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-E</option>,
	    <option>--extended-regexp</option></term>
	    <listitem>
	      <para>Use POSIX Extended Regular Expression
	        syntax.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-H</option>, <option>--with-filename</option></term>
	    <listitem>
	      <para>Print the name of the patch file containing each
	        match.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-h</option>, <option>--no-filename</option></term>
	    <listitem>
	      <para>Suppress the name of the patch file containing each
	        match.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-f</option> <replaceable>FILE</replaceable>,
	    <option>--file=<replaceable>FILE</replaceable></option></term>
	    <listitem>
	      <para>Read regular expressions from
	        <replaceable>FILE</replaceable>, one per line.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--output-matching</option>=hunk|file</term>
	    <listitem>
	      <para>Display the matching hunk-level or file-level
	       diffs.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--only-match</option>=rem|removals|add|additions|mod|modifications|all</term>
	    <listitem>
	      <para>Limit regex matching to removals, additions, modifications or
            the whole hunk.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of grepdiff.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--filter</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>filterdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--list</option></term>
	    <listitem>
	      <para>Behave like <citerefentry>
		  <refentrytitle>lsdiff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry> instead.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>filterdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>lsdiff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, <citerefentry>
	    <refentrytitle>patchview</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="recountdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>5 July 2002</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>recountdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>recountdiff</refname>
	<refpurpose>recompute patch counts and offsets</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>recountdiff</command>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>recountdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para><command>recountdiff</command> recomputes the counts and
	  offsets in unified context diffs.  It does this in two
	  passes: first the counts are corrected by inspection of
	  the actual patch lines, and then the offsets are adjusted
	  according to the computed counts.</para>

	<para>The corrected diff is sent to standard output.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of recountdiff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Limitations</title>

	<para>There are some things that cannot be dealt with.  If you
	  have removed the first context line in a hunk, for example,
	  there is no way for <command>recountdiff</command> to know
	  that.  For more precise fixing up, use <citerefentry>
	    <refentrytitle>rediff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry>, which uses the original and modified
	  diffs.</para>
      </refsect1>

      <refsect1>
	<title>See also</title>

	<para><citerefentry>
	    <refentrytitle>rediff</refentrytitle>
	    <manvolnum>1</manvolnum>
	  </citerefentry></para>
      </refsect1>
    </refentry>

    <refentry id="unwrapdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>17 January 2003</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>unwrapdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>unwrapdiff</refname>
	<refpurpose>demangle word-wrapped patches</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>unwrapdiff</command>
	  <arg choice="opt">-v</arg>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>unwrapdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para><command>unwrapdiff</command> demangles patches that
	  have been word-wrapped, in an attempt to make them
	  useful.</para>

	<para>The corrected diff is sent to standard output.  Note
	  that you will probably need to use the <option>-l</option>
	  option when applying the patch, in order to ignore any
	  whitespace differences there may be.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-v</option></term>
	    <listitem>
	      <para>Verbose operation.  A list of lines that are
	        modified in a way that might be wrong is sent to
	        stderr.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of unwrapdiff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Limitations</title>

	<para>Some heuristics are used to decide whether use a space
	  to recombine a wrapped line, or just join them
	  together.  Currently this is done by comparing with last
	  three characters of a line with the first two characters of
	  its continuation, and using a space if any of them are
	  different.</para>

	<para>The patch needs to have been valid before being
	  word-wrapped.</para>

	<para>The last line of a hunk is nearly always ambiguous.  If
 	  the next line begins <quote>@@</quote>,
 	  <quote>Index:&nbsp;</quote>, <quote>diff&nbsp;</quote> or
 	  <quote>---&nbsp;</quote> then it is taken to be complete;
 	  otherwise it is unwrapped using the next line.</para>
      </refsect1>
    </refentry>

    <refentry id="dehtmldiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>17 January 2003</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>dehtmldiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>dehtmldiff</refname>
	<refpurpose>get usable diff from an HTML page</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>dehtmldiff</command>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>dehtmldiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para><command>dehtmldiff</command> creates usable diff files
	  from HTML pages.  This is useful in the scenario where a
	  patch has been posted to a mailing list viewable via a web
	  page.</para>

	<para>The corrected diff is sent to standard output.  Note
	  that you will probably need to use the <option>-l</option>
	  option when applying the patch, in order to ignore any
	  whitespace differences there may be.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of dehtmldiff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Limitations</title>

	<para>The way this command works is fairly primitive; it boils
	  down to some simple text replacements, followed by an
	  <command>unwrapdiff</command> pass.  As a result, all of the
	  limitations that apply to <command>unwrapdiff</command> also
	  apply to <command>dehtmldiff</command>.</para>
      </refsect1>
    </refentry>

    <refentry id="flipdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>23 January 2009</date>
      </refentryinfo>

      <refmeta>
	<refentrytitle>flipdiff</refentrytitle>
	<manvolnum>1</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>flipdiff</refname>
	<refpurpose>exchange the order of two incremental patches</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>flipdiff</command>
	  <group choice="opt">
	    <arg>-p <replaceable>n</replaceable></arg>
	    <arg>--strip-match=<replaceable>n</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-U <replaceable>n</replaceable></arg>
	    <arg>--unified=<replaceable>n</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-d <replaceable>PAT</replaceable></arg>
	    <arg>--drop-context=<replaceable>PAT</replaceable></arg>
	  </group>
	  <group choice="opt">
	    <arg>-q</arg>
	    <arg>--quiet</arg>
	  </group>
	  <group choice="opt">
	    <arg>-z</arg>
	    <arg>--decompress</arg>
	  </group>
	  <group choice="opt">
	    <arg>-b</arg>
	    <arg>--ignore-space-change</arg>
	  </group>
	  <group choice="opt">
	    <arg>-B</arg>
	    <arg>--ignore-blank-lines</arg>
	  </group>
	  <group choice="opt">
	    <arg>-i</arg>
	    <arg>--ignore-case</arg>
	  </group>
	  <group choice="opt">
	    <arg>-w</arg>
	    <arg>--ignore-all-space</arg>
	  </group>
	  <arg choice="opt">--in-place</arg>
	  <arg choice="plain"><replaceable>diff1</replaceable></arg>
	  <arg choice="plain"><replaceable>diff2</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>flipdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para><command>flipdiff</command> exchanges the order of two
	  patch files that apply one after the other.  The patches
	  must be <quote>clean</quote>: the context lines must match
	  and there should be no mis-matched offsets.</para>

	<para>The swapped patches are sent to standard output, with a
	  marker line
	  (<quote><literal>===&nbsp;8&lt;&nbsp;===&nbsp;cut&nbsp;here&nbsp;===&nbsp;8&lt;&nbsp;===</literal></quote>)
	  between them, unless the <option>--in-place</option> option
	  is passed.  In that case, the output is written back to the
	  original input files.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>-p</option> <replaceable>n</replaceable>,
	    <option>--strip-match=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>When comparing filenames, ignore the first
                <replaceable>n</replaceable> pathname components from
                both patches. (This is similar to the
                <option>-p</option> option to GNU <citerefentry>
		  <refentrytitle>patch</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry>.)</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-q</option>, <option>--quiet</option></term>
	    <listitem>
	      <para>Quieter output.  Don't emit rationale lines at the
	       beginning of each patch.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-U</option> <replaceable>n</replaceable>,
	    <option>--unified=<replaceable>n</replaceable></option></term>
	    <listitem>
	      <para>Attempt to display <replaceable>n</replaceable>
                lines of context (requires at least
                <replaceable>n</replaceable> lines of context in both
                input files). (This is similar to the
                <option>-U</option> option to GNU
                <citerefentry>
		  <refentrytitle>diff</refentrytitle>
		  <manvolnum>1</manvolnum>
		</citerefentry>.)</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-d</option> <replaceable>pattern</replaceable>,
	    <option>--drop-context=<replaceable>PATTERN</replaceable></option></term>
	    <listitem>
	      <para>Don't display any context on files that match the
                shell wildcard <replaceable>pattern</replaceable>.
                This option can be given multiple times.</para>

	      <para>Note that the interpretation of the shell wildcard
	        pattern does not count slash characters or periods as
	        special (in other words, no flags are given to
	        <function>fnmatch</function>).  This is so that
	        <quote>*/basename</quote>-type patterns can be given
	        without limiting the number of pathname
	        components.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-i</option>, <option>--ignore-case</option></term>
	    <listitem>
	      <para>Consider upper- and lower-case to be the same.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-w</option>,
	    <option>--ignore-all-space</option></term>
	    <listitem>
	      <para>Ignore whitespace changes in patches.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-b</option>,
	    <option>--ignore-space-change</option></term>
	    <listitem>
	      <para>Ignore changes in the amount of whitespace.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-B</option>,
	    <option>--ignore-blank-lines</option></term>
	    <listitem>
	      <para>Ignore changes whose lines are all blank.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>-z</option>,
	    <option>--decompress</option></term>
	    <listitem>
	      <para>Decompress files with extensions .gz and .bz2.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--in-place</option></term>
	    <listitem>
	      <para>Write output to the original input files.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of flipdiff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Limitations</title>

	<para>This is only been very lightly tested, and may not even
	  work.  Using <option>--in-place</option> is not recommended
	  at the moment.</para>

	<para>There are some cases in which it is not possible to
	 meaningfully flip patches without understanding the semantics
	 of the content.  This program only uses complete lines that
	 appear at some stage during the application of the two
	 patches, and never composes a line from parts.</para>

	<para>Because of this, it is generally a good idea to read
	 through the output to check that it makes sense.</para>
      </refsect1>
    </refentry>

    <refentry id="espdiff">
      <refentryinfo>
	<productname>patchutils</productname>
	<date>5 March 2003</date>
	<authorgroup>
	  <author>
	    <firstname>Mike</firstname>
	    <surname>Harris</surname>
	    <affiliation>
	      <address><email>mharris@redhat.com</email></address>
	    </affiliation>
	    <contrib>Conceptual designer</contrib>
	  </author>
	</authorgroup>
      </refentryinfo>

      <refmeta>
	<refentrytitle>espdiff</refentrytitle>
	<manvolnum>6</manvolnum>
      </refmeta>

      <refnamediv>
	<refname>espdiff</refname>
	<refpurpose>apply the appropriate transformation to a set of
	 patches</refpurpose>
      </refnamediv>

      <refsynopsisdiv>
	<cmdsynopsis>
	  <command>espdiff</command>
	  <arg choice="opt">--deep-brainwave-mode</arg>
	  <arg choice="opt">--recurse</arg>
	  <arg choice="opt">--compare</arg>
	  <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg>
	</cmdsynopsis>

	<cmdsynopsis>
	  <command>espdiff</command>
	  <group choice="req">
	    <arg>--help</arg>
	    <arg>--version</arg>
	  </group>
	</cmdsynopsis>
      </refsynopsisdiv>

      <refsect1>
	<title>Description</title>

	<para><command>espdiff</command> applies the appropriate
	  transformation to a patch or set of patches, depending on
	  what you intend to accomplish.</para>

	<para>The input patches must be <quote>clean</quote>: in other
	 words they must apply without fuzz or offsets in whichever
	 order they are meant to be applied.  The exception is if you
	 intend <command>espdiff</command> to clean them for
	 you (good luck).</para>

	<para>You may find it useful to cross your fingers while the
	 program performs its task, or to screw your eyes tight shut
	 while imagining it doing the right thing.</para>
      </refsect1>

      <refsect1>
	<title>Options</title>

	<variablelist>
	  <varlistentry>
	    <term><option>--deep-brainwave-mode</option></term>
	    <listitem>
	      <para>Probes your brain deeply in a manner that takes
	       longer, but produces better extra sensory
	       results.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--recurse</option></term>
	    <listitem>
	      <para>Recurses neural pathways throughout all parts of
               the brain, in some cases determining code changes you
               might make far off in the future.  You may feel a
               gentle tickling sensation when using this
               option.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--compare</option></term>
	    <listitem>
	      <para>Allows the program to scan the current directory
               examining existing patches to determine areas of code
               you are likely to change again, and concentrating on
               these areas more closely.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--help</option></term>
	    <listitem>
	      <para>Display a short usage message.</para>
	    </listitem>
	  </varlistentry>

	  <varlistentry>
	    <term><option>--version</option></term>
	    <listitem>
	      <para>Display the version number of espdiff.</para>
	    </listitem>
	  </varlistentry>
	</variablelist>
      </refsect1>

      <refsect1>
	<title>Limitations</title>

	<para>Do not use this program while sleep-walking, or before
	 your first cup of coffee.</para>

	<para>There are some cases in which it is not possible to
	 determine what the intention of the user is.  In these cases,
	 you should construct the output you desire using an editor,
	 and send the input files together with the desired output
	 file to Tim Waugh <email>twaugh@redhat.com</email> asking for
	 a new diff tool.</para>
      </refsect1>
    </refentry>
  </reference>
</book>