{"thread":{"id":"60074","subject":"[PATCH] doc: rebase: rewrite docu for fixup/squash (again)","startedAt":"2023-08-07T17:09:50Z","lastAt":"2023-08-07T17:09:50Z","messageCount":1,"participants":["Oswald Buddenhagen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"480237","messageId":"20230807170935.2336699-1-oswald.buddenhagen@gmx.de","threadId":"60074","inReplyTo":null,"subject":"[PATCH] doc: rebase: rewrite docu for fixup/squash (again)","fromName":"Oswald Buddenhagen","fromEmail":"oswald.buddenhagen@gmx.de","sentAt":"2023-08-07T17:09:35Z","receivedAt":"2023-08-07T17:09:50Z","isPatch":true,"sender":{"key":"oswald.buddenhagen@gmx.de","avatar":"https://avatars.githubusercontent.com/u/812380?v=4"},"body":"Create a clear top-down structure which makes it hopefully unambiguous\nwhat happens when.\n\nAlso mention the timestamp along with the author - this is primarily\nmeant to include the keywords somebody might be searching for, like I\ndid a year ago.\n\nSigned-off-by: Oswald Buddenhagen \n\n---\nCc: Junio C Hamano \nCc: Phillip Wood \nCc: Christian Couder \nCc: Charvi Mendiratta \nCc: Marc Branchaud \n---\n Documentation/git-rebase.txt | 29 +++++++++++++++--------------\n 1 file changed, 15 insertions(+), 14 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex e7b39ad244..857e025361 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -890,20 +890,21 @@ command \"pick\" with the command \"reword\".\n To drop a commit, replace the command \"pick\" with \"drop\", or just\n delete the matching line.\n \n-If you want to fold two or more commits into one, replace the command\n-\"pick\" for the second and subsequent commits with \"squash\" or \"fixup\".\n-If the commits had different authors, the folded commit will be\n-attributed to the author of the first commit. The suggested commit\n-message for the folded commit is the concatenation of the first\n-commit's message with those identified by \"squash\" commands, omitting the\n-messages of commits identified by \"fixup\" commands, unless \"fixup -c\"\n-is used. In that case the suggested commit message is only the message\n-of the \"fixup -c\" commit, and an editor is opened allowing you to edit\n-the message. The contents (patch) of the \"fixup -c\" commit are still\n-incorporated into the folded commit. If there is more than one \"fixup -c\"\n-commit, the message from the final one is used. You can also use\n-\"fixup -C\" to get the same behavior as \"fixup -c\" except without opening\n-an editor.\n+If you want to fold two or more commits into one (that is, to combine\n+their contents/patches), replace the command \"pick\" for the second and\n+subsequent commits with \"squash\" or \"fixup\".\n+The commit message for the folded commit is the concatenation of the\n+first commit's message with those identified by \"squash\" commands,\n+omitting the messages of commits identified by \"fixup\" commands, unless\n+\"fixup -c\" is used. In the latter case, the message is obtained only\n+from the \"fixup -c\" commit (having more than one \"fixup -c\" commit\n+makes no sense, and only the message from the last one is used).\n+If the resulting commit message is a concatenation of multiple messages,\n+an editor is opened allowing you to edit it. This is also the case for a\n+message obtained via \"fixup -c\", while using \"fixup -C\" instead skips\n+the editor; this is analogous to the behavior of `git commit`.\n+The first commit which contributes to the suggested commit message also\n+determines the author, along with the date/timestamp.\n \n `git rebase` will stop when \"pick\" has been replaced with \"edit\" or\n when a command fails due to merge errors. When you are done editing\n-- \n2.40.0.152.g15d061e6df\n\n"}]}