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

Docfix. * ms/rebase-insnformat-doc-fix: Documentation: fix statement about rebase.instructionFormat
mjg · Jan 4, 2024 · d68f2be · d68f2be
2 parents 1237898 + 9cd30af
commit d68f2be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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.