rebase -i: use new --ff cherry-pick option

diff --git a/Documentation/git.txt b/Documentation/git.txt
index cc32ce18d213ab5e986df90b0b23a7eb79226c39..98b6e169827e91ced62af86694dba556819ac3a4 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -230,7 +230,10 @@ help ...`.
 
 -p::
 --paginate::
-       Pipe all output into 'less' (or if set, $PAGER).
+       Pipe all output into 'less' (or if set, $PAGER) if standard
+       output is a terminal.  This overrides the `pager.<cmd>`
+       configuration options (see the "Configuration Mechanism" section
+       below).
 
 --no-pager::
        Do not pipe git output into a pager.
@@ -402,7 +405,8 @@ people.  Here is an example:
 ------------
 
 Various commands read from the configuration file and adjust
-their operation accordingly.
+their operation accordingly.  See linkgit:git-config[1] for a
+list.
 
 
 Identifier Terminology