Merge branch 'maint'

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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c1f435f6df0b2e16d50546b61c2abab50b67acc0..f79184c0a83170ea54298f2b8ac960372371b0f3 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -555,7 +555,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.