diff options
author | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-01-07 17:19:06 +0000 |
---|---|---|
committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-01-07 17:19:06 +0000 |
commit | 448c51c2b60a5de0a473313b1bd7ebd3d259d321 (patch) | |
tree | 0dae56ba70f39b0de3ba3daffdd9e6da188a02d1 | |
parent | 117049525ee6be7d59e01041ec9eb692798d62e8 (diff) |
Document -p option. ok jmc@
-rw-r--r-- | usr.bin/diff/diff.1 | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 7728263db89..c14a7033f92 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: diff.1,v 1.22 2003/09/18 09:38:33 jmc Exp $ +.\" $OpenBSD: diff.1,v 1.23 2004/01/07 17:19:05 otto Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -37,7 +37,7 @@ .Nd differential file and directory comparator .Sh SYNOPSIS .Nm diff -.Op Fl abdilqtTw +.Op Fl abdilpqtTw .Oo .Fl c | Fl e | Fl f | .Fl n | Fl u @@ -45,7 +45,7 @@ .Op Fl L Ar label .Ar file1 file2 .Nm diff -.Op Fl abdilqtTw +.Op Fl abdilpqtTw .Op Fl L Ar label .Fl C Ar number .Ar file1 file2 @@ -54,12 +54,12 @@ .Fl D Ar string .Ar file1 file2 .Nm diff -.Op Fl abdilqtTw +.Op Fl abdilpqtTw .Op Fl L Ar label .Fl U Ar number .Ar file1 file2 .Nm diff -.Op Fl abdilNPqtTw +.Op Fl abdilNPpqtTw .Oo .Fl c | Fl e | Fl f | .Fl n | Fl u @@ -205,6 +205,12 @@ after all text file differences are reported. Print .Ar label instead of the first file name and time in the context or unified diff header. +.It Fl p +With unified and context diffs, show with each change +the first 40 characters of the last line before the context beginning +with a letter, an underscore or a dollar sign. +For C source code following standard layout conventions, this will +show the prototype of the function the change applies to. .It Fl t Will expand tabs in output lines. Normal or |