diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-13 03:09:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-13 03:09:57 +0300 |
| commit | 566471105c113e9c9d593a45b604ea8fd03a4484 (patch) | |
| tree | 7f7ff4b8b6eb0c8c2c0d14f0f9e9e4dc8143ad37 | |
| parent | 15df15fe07ef66b51302bb77e393f3c5502629de (diff) | |
| parent | 9cd30af991f8fe60f87fa92836e02cb3bf88864b (diff) | |
Merge branch 'ms/rebase-insnformat-doc-fix'
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 d59576dbb2..c6187ab28b 100644 --- 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 index 1dd6555f66..25516c45d8 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. |