diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 21:34:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 21:34:55 (GMT) |
| commit | d8355e5eaecddbcafdd66aa3d6433ae12f627177 (patch) | |
| tree | 1a788d01a91203b999b9c751a6ab1ad0ee8b143a | |
| parent | 8617715cc09b7422fe31189f9476f6ade73ede70 (diff) | |
| parent | 5e950c2199448d44388f7ca25c837fe7650da93c (diff) | |
| download | git-d8355e5eaecddbcafdd66aa3d6433ae12f627177.zip git-d8355e5eaecddbcafdd66aa3d6433ae12f627177.tar.gz git-d8355e5eaecddbcafdd66aa3d6433ae12f627177.tar.bz2 | |
Merge branch 'maint'
* maint:
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 c1f435f..f79184c 100644 --- 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. |