From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Nov 2016 21:27:58 +0000 (-0800)
Subject: Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint
X-Git-Tag: v2.10.3~12
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/50b8276ab95b41001c1b16085a39f22bf5d99286?hp=e9f74313e74337dadad7699a378280daa8d7fd44

Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint

Documentation fix.

* jk/rebase-config-insn-fmt-docfix:
doc: fix missing "::" in config list
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 21fdddf240..cbae7a65b6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2436,7 +2436,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.