From: Junio C Hamano <gitster@pobox.com>
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

Merge branch 'maint-1.8.1' into maint

* maint-1.8.1:
git help config: s/insn/instruction/
---

5e950c2199448d44388f7ca25c837fe7650da93c
diff --cc Documentation/config.txt
index b3023b8172,c5f1d68a56..b82e0816cb
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -544,14 -524,8 +544,14 @@@ core.editor:
  	variable when it is set, and the environment variable
  	`GIT_EDITOR` is not set.  See linkgit:git-var[1].
  
 +core.commentchar::
 +	Commands such as `commit` and `tag` that lets you edit
 +	messages consider a line that begins with this character
 +	commented, and removes them after the editor returns
 +	(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.