diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
| commit | b9d9d90d180cf21baeeb16bd89828d25c7901470 (patch) | |
| tree | a40241052af8d4f5543b66581e3f0235cfae0af3 /git-apply.html | |
| parent | ccb8252b46bfba5daf0cfcedaf0f9d2e14ba356f (diff) | |
| download | git-htmldocs-b9d9d90d180cf21baeeb16bd89828d25c7901470.tar.gz | |
Autogenerated HTML docs for v2.17.0-775-ge144d
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/git-apply.html b/git-apply.html index f12206598..68ab6cabf 100644 --- a/git-apply.html +++ b/git-apply.html @@ -1,9 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>git-apply(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -924,8 +925,10 @@ explained for the configuration variable <code>core.quotePath</code> (see </dt>
<dd>
<p>
- Remove <n> leading slashes from traditional diff paths. The
- default is 1.
+ Remove <n> leading path components (separated by slashes) from
+ traditional diff paths. E.g., with <code>-p2</code>, a patch against
+ <code>a/dir/file</code> will be applied directly to <code>file</code>. The default is
+ 1.
</p>
</dd>
<dt class="hdlist1">
@@ -1147,7 +1150,7 @@ has no effect when <code>--index</code> or <code>--cached</code> is in use.</p>< </div>
</div>
<div class="sect1">
-<h2 id="_configuration">Configuration</h2>
+<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1173,7 +1176,7 @@ apply.whitespace </div>
</div>
<div class="sect1">
-<h2 id="_submodules">Submodules</h2>
+<h2 id="_submodules">SUBMODULES</h2>
<div class="sectionbody">
<div class="paragraph"><p>If the patch contains any changes to submodules then <em>git apply</em>
treats these changes as follows.</p></div>
@@ -1204,7 +1207,7 @@ subdirectory is checked and (if possible) updated.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-05-23 16:06:29 JST
</div>
</div>
</body>
|