diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:12 -0800 |
| commit | d690c8e14209df2549742ad83e51570765a47993 (patch) | |
| tree | 5f8cddc1744be200e60d17f8b5f41374e7af82c2 | |
| parent | 5b49c1af03e600c286f63d9d9c9fb01403230b9f (diff) | |
| parent | 9cd30af991f8fe60f87fa92836e02cb3bf88864b (diff) | |
| download | git-d690c8e14209df2549742ad83e51570765a47993.tar.gz | |
Merge branch 'ms/rebase-insnformat-doc-fix' into maint-2.43
Docfix.
* ms/rebase-insnformat-doc-fix:
Documentation: fix statement about rebase.instructionFormat
| -rw-r--r-- | Documentation/config/rebase.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index 9c248accec..7c57c5ee80 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -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 diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index b4526ca246..b8de442d67 100644 --- 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. |