Merge branch 'maint-1.8.1' into maint

* maint-1.8.1:
  git help config: s/insn/instruction/
This commit is contained in:
Junio C Hamano 2013-03-28 14:34:07 -07:00
commit 5e950c2199

View File

@ -551,7 +551,7 @@ core.commentchar::
(default '#'). (default '#').
sequence.editor:: 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. 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. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
When not configured the default commit message editor is used instead. When not configured the default commit message editor is used instead.