{"thread":{"id":"60681","subject":"[PATCH] Documentation: fix statement about rebase.instructionFormat","startedAt":"2024-01-03T18:14:26Z","lastAt":"2024-01-03T19:23:05Z","messageCount":2,"participants":["Maarten van der Schrieck via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"486273","messageId":"pull.1629.git.git.1704305663254.gitgitgadget@gmail.com","threadId":"60681","inReplyTo":null,"subject":"[PATCH] Documentation: fix statement about rebase.instructionFormat","fromName":"Maarten van der Schrieck via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-01-03T18:14:23Z","receivedAt":"2024-01-03T18:14:26Z","isPatch":true,"sender":{"key":"name:Maarten van der Schrieck","avatar":null},"body":"From: Maarten van der Schrieck <maarten@thingsconnected.nl>\n\nSince commit 62db5247790f2612c0b407a15d1901d88789d35a \"rebase -i: generate\nthe script via rebase--helper\" (Jul 14 2017), the short hash is given in\nrebase-todo. Specifying rebase.instructionFormat does not alter this\nbehavior, contrary to what the documentation implies.\n\nSigned-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>\n---\n    Documentation: fix statement about rebase.instructionFormat\n    \n    Since commit 62db5247790f2612c0b407a15d1901d88789d35a \"rebase -i:\n    generate the script via rebase--helper\" (Jul 14 2017), the short hash is\n    given in rebase-todo. Specifying rebase.instructionFormat does not alter\n    this behavior, contrary to what the documentation implies.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1629%2Fthingsconnected%2Fpullreq1-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1629/thingsconnected/pullreq1-v1\nPull-Request: https://github.com/git/git/pull/1629\n\n Documentation/config/rebase.txt | 2 +-\n Documentation/git-rebase.txt    | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt\nindex d59576dbb23..c6187ab28b2 100644\n--- a/Documentation/config/rebase.txt\n+++ b/Documentation/config/rebase.txt\n@@ -40,7 +40,7 @@ rebase.missingCommitsCheck::\n rebase.instructionFormat::\n \tA format string, as specified in linkgit:git-log[1], to be used for the\n \ttodo list during an interactive rebase.  The format will\n-\tautomatically have the long commit hash prepended to the format.\n+\tautomatically have the commit hash prepended to the format.\n \n rebase.abbreviateCommands::\n \tIf set to true, `git rebase` will use abbreviated command names in the\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 1dd6555f66b..25516c45d8b 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -523,7 +523,7 @@ See also INCOMPATIBLE OPTIONS below.\n +\n The commit list format can be changed by setting the configuration option\n rebase.instructionFormat.  A customized instruction format will automatically\n-have the long commit hash prepended to the format.\n+have the commit hash prepended to the format.\n +\n See also INCOMPATIBLE OPTIONS below.\n \n\nbase-commit: 055bb6e9969085777b7fab83e3fee0017654f134\n-- \ngitgitgadget\n"},{"id":"486276","messageId":"xmqq1qay9q7g.fsf@gitster.g","threadId":"60681","inReplyTo":"pull.1629.git.git.1704305663254.gitgitgadget@gmail.com","subject":"Re: [PATCH] Documentation: fix statement about rebase.instructionFormat","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-01-03T19:22:59Z","receivedAt":"2024-01-03T19:23:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Maarten van der Schrieck via GitGitGadget\" <gitgitgadget@gmail.com>\nwrites:\n\n> From: Maarten van der Schrieck <maarten@thingsconnected.nl>\n>\n> Since commit 62db5247790f2612c0b407a15d1901d88789d35a \"rebase -i: generate\n> the script via rebase--helper\" (Jul 14 2017), the short hash is given in\n> rebase-todo. Specifying rebase.instructionFormat does not alter this\n> behavior, contrary to what the documentation implies.\n>\n> Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl>\n> ---\n\nLooks good.  Will queue.  Thanks.\n\n\n>     Documentation: fix statement about rebase.instructionFormat\n>     \n>     Since commit 62db5247790f2612c0b407a15d1901d88789d35a \"rebase -i:\n>     generate the script via rebase--helper\" (Jul 14 2017), the short hash is\n>     given in rebase-todo. Specifying rebase.instructionFormat does not alter\n>     this behavior, contrary to what the documentation implies.\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1629%2Fthingsconnected%2Fpullreq1-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1629/thingsconnected/pullreq1-v1\n> Pull-Request: https://github.com/git/git/pull/1629\n>\n>  Documentation/config/rebase.txt | 2 +-\n>  Documentation/git-rebase.txt    | 2 +-\n>  2 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt\n> index d59576dbb23..c6187ab28b2 100644\n> --- a/Documentation/config/rebase.txt\n> +++ b/Documentation/config/rebase.txt\n> @@ -40,7 +40,7 @@ rebase.missingCommitsCheck::\n>  rebase.instructionFormat::\n>  \tA format string, as specified in linkgit:git-log[1], to be used for the\n>  \ttodo list during an interactive rebase.  The format will\n> -\tautomatically have the long commit hash prepended to the format.\n> +\tautomatically have the commit hash prepended to the format.\n>  \n>  rebase.abbreviateCommands::\n>  \tIf set to true, `git rebase` will use abbreviated command names in the\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index 1dd6555f66b..25516c45d8b 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -523,7 +523,7 @@ See also INCOMPATIBLE OPTIONS below.\n>  +\n>  The commit list format can be changed by setting the configuration option\n>  rebase.instructionFormat.  A customized instruction format will automatically\n> -have the long commit hash prepended to the format.\n> +have the commit hash prepended to the format.\n>  +\n>  See also INCOMPATIBLE OPTIONS below.\n>  \n>\n> base-commit: 055bb6e9969085777b7fab83e3fee0017654f134\n"}]}