summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-31 13:15:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-31 13:15:24 -0700
commit702b6a6fc0ed8cebdb1c60856fa24b9e947fa0e0 (patch)
tree23c2050309220d948c271f3189510d670486b5fe
parentMerge branch 'ak/pre-receive-hook-template-modefix' (diff)
parentdoc: fix missing "::" in config list (diff)
downloadtgif-702b6a6fc0ed8cebdb1c60856fa24b9e947fa0e0.tar.xz
Merge branch 'jk/rebase-config-insn-fmt-docfix'
Documentation fix. * jk/rebase-config-insn-fmt-docfix: doc: fix missing "::" in config list
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 27069ac032..a0ab66aae7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2450,7 +2450,7 @@ rebase.missingCommitsCheck::
command in the todo-list.
Defaults to "ignore".
-rebase.instructionFormat
+rebase.instructionFormat::
A format string, as specified in linkgit:git-log[1], to be used for
the instruction list during an interactive rebase. The format will automatically
have the long commit hash prepended to the format.