Merge branch 'jk/long-error-messages'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 7dc613cf3e5cdd04ed1c0725696ed3a11e6e14f1..ca039546a463bee511ca3a1c7d301689fb56a412 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -213,6 +213,12 @@ rebase.autoSquash::
 rebase.autoStash::
        If set to true enable '--autostash' option by default.
 
+rebase.missingCommitsCheck::
+       If set to "warn", print warnings about removed commits in
+       interactive mode. If set to "error", print the warnings and
+       stop the rebase. If set to "ignore", no checking is
+       done. "ignore" by default.
+
 rebase.instructionFormat::
        Custom commit list format to use during an '--interactive' rebase.
 
@@ -521,6 +527,9 @@ rebasing.
 If you just want to edit the commit message for a commit, replace the
 command "pick" with the command "reword".
 
+To drop a commit, replace the command "pick" with "drop", or just
+delete the matching line.
+
 If you want to fold two or more commits into one, replace the command
 "pick" for the second and subsequent commits with "squash" or "fixup".
 If the commits had different authors, the folded commit will be