From: Junio C Hamano Date: Mon, 31 Oct 2016 20:15:24 +0000 (-0700) Subject: Merge branch 'jk/rebase-config-insn-fmt-docfix' X-Git-Tag: v2.11.0-rc0~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/702b6a6fc0ed8cebdb1c60856fa24b9e947fa0e0?hp=3d0ff881d0818c5bb93da99f74c3c343e07d18af Merge branch 'jk/rebase-config-insn-fmt-docfix' 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 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.