diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:58 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:58 -0800 |
commit | 50b8276ab95b41001c1b16085a39f22bf5d99286 (patch) | |
tree | 0602ac5169d7a078fd95e08e54c2bf67fa003f84 | |
parent | e9f74313e74337dadad7699a378280daa8d7fd44 (diff) | |
parent | 6d834ac8f182fb8bb67e7e2bc39605b0efaf8549 (diff) | |
download | git-50b8276ab95b41001c1b16085a39f22bf5d99286.tar.gz |
Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint
Documentation fix.
* jk/rebase-config-insn-fmt-docfix:
doc: fix missing "::" in config list
-rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. |