Merge branches 'jc/rev-list' and 'jc/pack-thin'

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 51c7d47092010f4275d1de8f074e0cc28e1d5adc..75076b61216c7ee5ce0a55e5a7c578f5f06b6187 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/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]
          [<patch>...]
 
 DESCRIPTION
@@ -68,6 +68,10 @@ OPTIONS
        backslash characters replaced with `\t`, `\n`, and `\\`,
        respectively.
 
+-p<n>::
+       Remove <n> 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