From: Junio C Hamano Date: Wed, 1 Feb 2006 00:59:26 +0000 (-0800) Subject: Autogenerated HTML docs for v1.1.6-g8233 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8af15b04c4535eb780909bafadd1eea63e88d5d5;p=git.git Autogenerated HTML docs for v1.1.6-g8233 --- diff --git a/git-apply.html b/git-apply.html index ae66a845..4c1a58e1 100644 --- a/git-apply.html +++ b/git-apply.html @@ -274,7 +274,7 @@ git-apply(1) Manual Page
git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] - [--no-add] [--index-info] [--allow-binary-replacement] [-z] + [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [<patch>…]

DESCRIPTION

@@ -374,6 +374,15 @@ and a work tree.

+-p<n> +
+
+

+ Remove <n> leading slashes from traditional diff paths. The + default is 1. +

+
+
--apply
@@ -429,7 +438,7 @@ and a work tree.

diff --git a/git-apply.txt b/git-apply.txt index 51c7d470..75076b61 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] - [--no-add] [--index-info] [--allow-binary-replacement] [-z] + [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [...] DESCRIPTION @@ -68,6 +68,10 @@ OPTIONS backslash characters replaced with `\t`, `\n`, and `\\`, respectively. +-p:: + Remove leading slashes from traditional diff paths. The + default is 1. + --apply:: If you use any of the options marked ``Turns off "apply"'' above, git-apply reads and outputs the