Skip to content

Commit

Permalink
Documentation: fix statement about rebase.instructionFormat
Browse files Browse the repository at this point in the history
Since commit 62db524 (rebase -i: generate the script via
rebase--helper, 2017-07-14), the short hash is given in
rebase-todo. Specifying rebase.instructionFormat does not alter this
behavior, contrary to what the documentation implies.

Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
mvds00 authored and gitster committed Jan 3, 2024
1 parent 0d1bd1d commit 9cd30af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Documentation/config/rebase.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-rebase.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 9cd30af

Please sign in to comment.