Merge branch 'master' of git://github.com/git-l10n/git-po

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index ad0888bfcb78aab335a734ffd7c2d68ca7b750fb..67228494c00e1df676723072d0884f7705e532f1 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -113,8 +113,10 @@ explained for the configuration variable `core.quotePath` (see
 linkgit:git-config[1]).
 
 -p<n>::
-       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 `-p2`, a patch against
+       `a/dir/file` will be applied directly to `file`. The default is
+       1.
 
 -C<n>::
        Ensure at least <n> lines of surrounding context match before