summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Matthias Krüger <matthias.krueger@famsik.de>2013-03-27 23:53:50 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-28 08:53:47 -0700
commit3322ad428446b2d54e95b50fc70abc1ece1f4069 (patch)
tree58b5fdb7a40ccd4e7157707092b7bb58f0d4af8b
parentmerge-tree: fix typo in merge-tree.c::unresolved (diff)
downloadtgif-3322ad428446b2d54e95b50fc70abc1ece1f4069.tar.xz
git help config: s/insn/instruction/
"insn" appears to be an in-code abbreviation and should not appear in manual/help pages. Signed-off-by: Matthias Krüger <matthias.krueger@famsik.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e37ba94a72..c5f1d68a56 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -525,7 +525,7 @@ core.editor::
`GIT_EDITOR` is not set. See linkgit:git-var[1].
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.