Merge branch 'maint'

* maint: git help config: s/insn/instruction/
git-mirror · Mar 28, 2013 · d8355e5 · d8355e5
2 parents 8617715 + 5e950c2
commit d8355e5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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.