From: Junio C Hamano Date: Thu, 28 Mar 2013 21:34:07 +0000 (-0700) Subject: Merge branch 'maint-1.8.1' into maint X-Git-Tag: v1.8.2.1~27 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e950c2199448d44388f7ca25c837fe7650da93c?hp=9a82efd0d2a2727507bd908d7f0545437fcc0ff6 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 b3023b8172..b82e0816cb 100644 --- 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.