diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:34:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:34:07 -0700 |
| commit | 5e950c2199448d44388f7ca25c837fe7650da93c (patch) | |
| tree | a376b3c5e7e0dbb74fa3b92245ed93db7cc33160 | |
| parent | 9a82efd0d2a2727507bd908d7f0545437fcc0ff6 (diff) | |
| parent | 3322ad428446b2d54e95b50fc70abc1ece1f4069 (diff) | |
| download | git-5e950c2199448d44388f7ca25c837fe7650da93c.tar.gz | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
git help config: s/insn/instruction/
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. |