diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-10 02:30:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-10 02:30:50 +0000 |
| commit | 208beb7160e9d42ed3938d959525e6d89c642e39 (patch) | |
| tree | e909419273f7700fad1411d4fedd54a33859a1b7 /git-apply.txt | |
| parent | d32738e0772f0454a46ea02d69165f3bcc5aefc6 (diff) | |
| download | git-htmldocs-208beb7160e9d42ed3938d959525e6d89c642e39.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-291-g7eef3
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/git-apply.txt b/git-apply.txt index e9f724b2f..feb51f124 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -14,7 +14,7 @@ SYNOPSIS [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [--whitespace=<nowarn|warn|fix|error|error-all>] - [--exclude=PATH] [--verbose] [<patch>...] + [--exclude=PATH] [--directory=<root>] [--verbose] [<patch>...] DESCRIPTION ----------- @@ -182,6 +182,14 @@ behavior: by inspecting the patch (e.g. after editing the patch without adjusting the hunk headers appropriately). +--directory=<root>:: + Prepend <root> to all filenames. If a "-p" argument was passed, too, + it is applied before prepending the new root. ++ +For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` +can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by +running `git apply --directory=modules/git-gui`. + Configuration ------------- |