Merge branch 'ms/rebase-insnformat-doc-fix'

gitster · gitster · commit 566471105c11 · 2024-01-12T16:09:57.000-08:00
Docfix.

* ms/rebase-insnformat-doc-fix:
  Documentation: fix statement about rebase.instructionFormat
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
@@ -40,7 +40,7 @@ rebase.missingCommitsCheck::
 rebase.instructionFormat::
 	A format string, as specified in linkgit:git-log[1], to be used for the
 	todo list during an interactive rebase.  The format will
-	automatically have the long commit hash prepended to the format.
+	automatically have the commit hash prepended to the format.
 
 rebase.abbreviateCommands::
 	If set to true, `git rebase` will use abbreviated command names in the
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
@@ -523,7 +523,7 @@ See also INCOMPATIBLE OPTIONS below.
 +
 The commit list format can be changed by setting the configuration option
 rebase.instructionFormat.  A customized instruction format will automatically
-have the long commit hash prepended to the format.
+have the commit hash prepended to the format.
 +
 See also INCOMPATIBLE OPTIONS below.
 

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ See also INCOMPATIBLE OPTIONS below.`
`523`	`523`	`+`
`524`	`524`	`The commit list format can be changed by setting the configuration option`
`525`	`525`	`rebase.instructionFormat. A customized instruction format will automatically`
`526`		`-have the long commit hash prepended to the format.`
	`526`	`+have the commit hash prepended to the format.`
`527`	`527`	`+`
`528`	`528`	`See also INCOMPATIBLE OPTIONS below.`
`529`	`529`