summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorjdp <jdp@FreeBSD.org>1996-02-07 23:47:55 +0000
committerjdp <jdp@FreeBSD.org>1996-02-07 23:47:55 +0000
commitdf590699c9bc7c14738962f5ec475ad0270c2891 (patch)
treec1ac5e481606004e48b1946e956a5d3313973426 /gnu
parent458006d55022689f8a0e0bf2842921a8b113af11 (diff)
downloadFreeBSD-src-df590699c9bc7c14738962f5ec475ad0270c2891.zip
FreeBSD-src-df590699c9bc7c14738962f5ec475ad0270c2891.tar.gz
Update the manual page to reflect the fact that an "Index" line
now takes precedence over a context diff header for determining the name of the file to patch.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/patch/patch.17
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1
index 6af062a..6eec2b4 100644
--- a/gnu/usr.bin/patch/patch.1
+++ b/gnu/usr.bin/patch/patch.1
@@ -1,8 +1,11 @@
.\" -*- nroff -*-
.rn '' }`
-'\" $Header: /home/cvs/386BSD/src/gnu/usr.bin/patch/patch.1,v 1.3 1994/02/17 22:20:33 jkh Exp $
+'\" $Header: /home/ncvs/src/gnu/usr.bin/patch/patch.1,v 1.4 1994/02/25 21:45:59 phk Exp $
'\"
'\" $Log: patch.1,v $
+'\" Revision 1.4 1994/02/25 21:45:59 phk
+'\" added the -C/-check again.
+'\"
.\" Revision 1.3 1994/02/17 22:20:33 jkh
.\" Put this back - I was somehow under the erroneous impression that patch was in
.\" ports, until I saw the the commit messages, that is! :-) All changed backed out.
@@ -208,7 +211,7 @@ Only context diffs have lines like that, but if there is an \*(L"Index:\*(R"
line in the leading garbage,
.I patch
will try to use the file name from that line.
-The context diff header takes precedence over an Index line.
+The Index line, if present, takes precedence over the context diff header.
If no file name can be intuited from the leading garbage, you will be asked
for the name of the file to patch.
.PP
OpenPOWER on IntegriCloud