summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-21 23:04:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-21 23:04:37 (GMT)
commit9ee3d3774316f6a60c0618aa7a64fc7a59a8f338 (patch)
tree5aa9c4b308d4d084a1d10d718906c86e2b4b711f /Documentation
parent0445ba2457b066a70334877f2d638e1f7a974220 (diff)
parent821881d88d3012a64a52ece9a8c2571ca00c35cd (diff)
downloadgit-9ee3d3774316f6a60c0618aa7a64fc7a59a8f338.zip
git-9ee3d3774316f6a60c0618aa7a64fc7a59a8f338.tar.gz
git-9ee3d3774316f6a60c0618aa7a64fc7a59a8f338.tar.bz2
Merge branch 'po/insn-editor'
* po/insn-editor: "rebase -i": support special-purpose editor to edit insn sheet
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9c81fff..5a841da 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -474,6 +474,12 @@ core.editor::
variable when it is set, and the environment variable
`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.
+ 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.
+
core.pager::
The command that git will use to paginate output. Can
be overridden with the `GIT_PAGER` environment