Merge branch 'maint-1.8.1' into maint

* maint-1.8.1:
git help config: s/insn/instruction/

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b3023b817244d5b315f8e3227eaa87fd888ecf95..b82e0816cbd775de8d34b3af2afb21c97d98bbf7 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -551,7 +551,7 @@ core.commentchar::
        (default '#').
 
 sequence.editor::
-       Text editor used by `git rebase -i` for editing the rebase insn file.
+       Text editor used by `git rebase -i` for editing the rebase instruction file.
        The value is meant to be interpreted by the shell when it is used.
        It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
        When not configured the default commit message editor is used instead.