Deleted Added
full compact
patch.1 (267701) patch.1 (267747)
1.\"-
2.\" Copyright 1986, Larry Wall
3.\"
4.\" Redistribution and use in source and binary forms, with or without
5.\" modification, are permitted provided that the following condition
6.\" is met:
7.\" 1. Redistributions of source code must retain the above copyright
8.\" notice, this condition and the following disclaimer.

--- 6 unchanged lines hidden (view full) ---

15.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
16.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
17.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
18.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
19.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
20.\" SUCH DAMAGE.
21.\"
22.\" $OpenBSD: patch.1,v 1.27 2014/04/15 06:26:54 jmc Exp $
1.\"-
2.\" Copyright 1986, Larry Wall
3.\"
4.\" Redistribution and use in source and binary forms, with or without
5.\" modification, are permitted provided that the following condition
6.\" is met:
7.\" 1. Redistributions of source code must retain the above copyright
8.\" notice, this condition and the following disclaimer.

--- 6 unchanged lines hidden (view full) ---

15.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
16.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
17.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
18.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
19.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
20.\" SUCH DAMAGE.
21.\"
22.\" $OpenBSD: patch.1,v 1.27 2014/04/15 06:26:54 jmc Exp $
23.\" $FreeBSD: stable/10/usr.bin/patch/patch.1 267701 2014-06-21 01:48:45Z pfg $
24.Dd June 12, 2014
23.\" $FreeBSD: stable/10/usr.bin/patch/patch.1 267747 2014-06-22 20:29:51Z pfg $
24.Dd June 15, 2014
25.Dt PATCH 1
26.Os
27.Sh NAME
28.Nm patch
29.Nd apply a diff file to an original
30.Sh SYNOPSIS
31.Nm
32.Bk -words

--- 69 unchanged lines hidden (view full) ---

102.Qq .orig
103unless the file already has a numbered backup, in which case a numbered
104backup is made.
105This is equivalent to specifying
106.Qo Fl V Cm existing Qc .
107This option is currently the default, unless
108.Fl -posix
109is specified.
25.Dt PATCH 1
26.Os
27.Sh NAME
28.Nm patch
29.Nd apply a diff file to an original
30.Sh SYNOPSIS
31.Nm
32.Bk -words

--- 69 unchanged lines hidden (view full) ---

102.Qq .orig
103unless the file already has a numbered backup, in which case a numbered
104backup is made.
105This is equivalent to specifying
106.Qo Fl V Cm existing Qc .
107This option is currently the default, unless
108.Fl -posix
109is specified.
110.It Fl C , Fl Fl check
110.It Fl C , Fl Fl check , Fl Fl dry-run
111Checks that the patch would apply cleanly, but does not modify anything.
112.It Fl c , Fl Fl context
113Forces
114.Nm
115to interpret the patch file as a context diff.
116.It Xo
117.Fl D Ar symbol ,
118.Fl Fl ifdef Ar symbol

--- 579 unchanged lines hidden ---
111Checks that the patch would apply cleanly, but does not modify anything.
112.It Fl c , Fl Fl context
113Forces
114.Nm
115to interpret the patch file as a context diff.
116.It Xo
117.Fl D Ar symbol ,
118.Fl Fl ifdef Ar symbol

--- 579 unchanged lines hidden ---