diff options
Diffstat (limited to 'gnu/usr.bin/patch')
| -rw-r--r-- | gnu/usr.bin/patch/patch.1 | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/patch/pch.c | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1 index 6af062a28896..edc690f13516 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 diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c index 6e84b7de41c1..a607f67641cb 100644 --- a/gnu/usr.bin/patch/pch.c +++ b/gnu/usr.bin/patch/pch.c @@ -1,6 +1,9 @@ -/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.5.4.1 1995/09/17 06:39:59 davidg Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.5.4.2 1996/04/11 10:33:45 markm Exp $ * * $Log: pch.c,v $ + * Revision 1.5.4.2 1996/04/11 10:33:45 markm + * Merge with HEAD an improved Index: priority fix. + * * Revision 1.5.4.1 1995/09/17 06:39:59 davidg * Brought in changes from rev 1.6: Give 'Index:' priority over other paths. * @@ -370,8 +373,6 @@ intuit_diff_type() else filearg[0] = savestr(newname); } - else if (indname) - filearg[0] = savestr(indname); else if (oldname) filearg[0] = savestr(oldname); else if (newname) |