rebase: Allow merge strategies to be used when rebasing

diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index 660c18ff8d6074ad8e93e5eca0805f157dd2e592..d5142e0dcd6799b8a94c9cd5a3f2bd17c3cb7289 100644 (file)
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -49,7 +49,7 @@ OPTIONS
 -------
 
 --replace-all::
-       Default behaviour is to replace at most one line. This replaces
+       Default behavior is to replace at most one line. This replaces
        all lines matching the key (and optionally the value_regex).
 
 --get::