diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-01 00:44:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 18:04:28 -0700 |
| commit | c4730f35cc6507bc117a08885d88668fe02b1a7d (patch) | |
| tree | b1383c7eada1a147d2bcd6b2db08da8c3a763520 /Documentation/git-apply.txt | |
| parent | 66037991d3fd2ac7e699c7bd21d939b9e397f6a4 (diff) | |
| download | git-c4730f35cc6507bc117a08885d88668fe02b1a7d.tar.gz | |
Teach "git apply" to prepend a prefix with "--root=<root>"
With "git apply --root=<root>", all file names in the patch are prepended
with <root>. If a "-p" value was given, the paths are stripped _before_
prepending <root>.
Wished for by HPA.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index c8347637da..63fce53690 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -14,7 +14,7 @@ SYNOPSIS [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--cached] [--whitespace=<nowarn|warn|fix|error|error-all>] - [--exclude=PATH] [--verbose] [<patch>...] + [--exclude=PATH] [--root=<root>] [--verbose] [<patch>...] DESCRIPTION ----------- @@ -177,6 +177,10 @@ behavior: current patch being applied will be printed. This option will cause additional information to be reported. +--root=<root>:: + Prepend <root> to all filenames. If a "-p" argument was passed, too, + it is applied before prepending the new root. + Configuration ------------- |