fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 4b10304740f5035095c19be05859ae0b9205e9a0..e0412e0866db8f80e8bbc8f33caaa659461d90aa 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -262,8 +262,7 @@ hook if one exists.  You can use this hook to do sanity checks and
 reject the rebase if it isn't appropriate.  Please see the template
 pre-rebase hook script for an example.
 
-You must be in the top directory of your project to start (or continue)
-a rebase.  Upon completion, <branch> will be the current branch.
+Upon completion, <branch> will be the current branch.
 
 INTERACTIVE MODE
 ----------------