{"thread":{"id":"63746","subject":"[PATCH] docs: correct mistakes in git-merge","startedAt":"2025-07-05T17:39:21Z","lastAt":"2025-07-17T17:28:45Z","messageCount":3,"participants":["Timur Sultanaev via GitGitGadget","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"521344","messageId":"pull.1940.git.1751737158670.gitgitgadget@gmail.com","threadId":"63746","inReplyTo":null,"subject":"[PATCH] docs: correct mistakes in git-merge","fromName":"Timur Sultanaev via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-07-05T17:39:18Z","receivedAt":"2025-07-05T17:39:21Z","isPatch":true,"sender":{"key":"name:Timur Sultanaev","avatar":null},"body":"From: Timur Sultanaev <str.write@gmail.com>\n\nDocumentation for git-merge incorrectly notes that\ntip of the current branch on ascii diagram is C\n, while it is actually G (current branch is\nmaster, HEAD on diagram is G).\n\nAdditionally diagrams on the page are adjusted\nto use spaces instead of tabs, so that they align\nregardless of tab size. This is in line with\ndiagrams on other git documentation pages.\n\nSigned-off-by: Timur Sultanaev <str.write@gmail.com>\n---\n    Correct mistakes in git-merge documentation\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1940%2Fstrowk%2Fmaster-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1940/strowk/master-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1940\n\n Documentation/git-merge.adoc | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc\nindex d53923c3b73..a055384ad69 100644\n--- a/Documentation/git-merge.adoc\n+++ b/Documentation/git-merge.adoc\n@@ -28,8 +28,8 @@ Assume the following history exists and the current branch is\n `master`:\n \n ------------\n-\t  A---B---C topic\n-\t /\n+          A---B---C topic\n+         /\n     D---E---F---G master\n ------------\n \n@@ -38,11 +38,11 @@ Then `git merge topic` will replay the changes made on the\n its current commit (`C`) on top of `master`, and record the result\n in a new commit along with the names of the two parent commits and\n a log message from the user describing the changes. Before the operation,\n-`ORIG_HEAD` is set to the tip of the current branch (`C`).\n+`ORIG_HEAD` is set to the tip of the current branch (`G`).\n \n ------------\n-\t  A---B---C topic\n-\t /         \\\n+          A---B---C topic\n+         /         \\\n     D---E---F---G---H master\n ------------\n \n\nbase-commit: 8b6f19ccfc3aefbd0f22f6b7d56ad6a3fc5e4f37\n-- \ngitgitgadget\n"},{"id":"522219","messageId":"6518dd3b-ca05-1ce8-e700-81167cd2e88e@gmx.de","threadId":"63746","inReplyTo":"pull.1940.git.1751737158670.gitgitgadget@gmail.com","subject":"Re: [PATCH] docs: correct mistakes in git-merge","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2025-07-17T17:12:55Z","receivedAt":"2025-07-17T17:12:58Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Tumur,\n\nOn Sat, 5 Jul 2025, Timur Sultanaev via GitGitGadget wrote:\n\n> From: Timur Sultanaev <str.write@gmail.com>\n> \n> Documentation for git-merge incorrectly notes that\n> tip of the current branch on ascii diagram is C\n> , while it is actually G (current branch is\n> master, HEAD on diagram is G).\n> \n> Additionally diagrams on the page are adjusted\n> to use spaces instead of tabs, so that they align\n> regardless of tab size. This is in line with\n> diagrams on other git documentation pages.\n\nTo be precise, you could add to the commit message that the faulty\ndescription was introduced in 0c514d576685 (git-merge.txt: mention\n'ORIG_HEAD' in the Description, 2023-01-10). (I Cc:ed Philippe Blain who\nauthored that patch.)\n\n> Signed-off-by: Timur Sultanaev <str.write@gmail.com>\n> ---\n>     Correct mistakes in git-merge documentation\n> \n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1940%2Fstrowk%2Fmaster-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1940/strowk/master-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1940\n> \n>  Documentation/git-merge.adoc | 10 +++++-----\n>  1 file changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc\n> index d53923c3b73..a055384ad69 100644\n> --- a/Documentation/git-merge.adoc\n> +++ b/Documentation/git-merge.adoc\n> @@ -28,8 +28,8 @@ Assume the following history exists and the current branch is\n>  `master`:\n>  \n>  ------------\n> -\t  A---B---C topic\n> -\t /\n> +          A---B---C topic\n> +         /\n\nThis replaces tabs with spaces — though elsewhere in the file, tabs\ncontinue to roam free. The change assumes your pager or editor shares\nGit’s long-standing view that tabs are 8 columns wide (a convention with\nmany loyal followers, even if not universally embraced...). That said,\nwhile correcting the description seemed fairly straight-forward, this\nwhite-space change appears to tread on more delicate territory. It might\ndeserve its own patch — though I wouldn’t be shocked if it quietly joins\nthe fate of the dodo.\n\nThe same applies to the white-space change at the end of this patch.\n\n>      D---E---F---G master\n>  ------------\n>  \n> @@ -38,11 +38,11 @@ Then `git merge topic` will replay the changes made on the\n>  its current commit (`C`) on top of `master`, and record the result\n>  in a new commit along with the names of the two parent commits and\n>  a log message from the user describing the changes. Before the operation,\n> -`ORIG_HEAD` is set to the tip of the current branch (`C`).\n> +`ORIG_HEAD` is set to the tip of the current branch (`G`).\n\nThis is obviously a good fix.\n\nCiao,\nJohannes\n\n>  \n>  ------------\n> -\t  A---B---C topic\n> -\t /         \\\n> +          A---B---C topic\n> +         /         \\\n>      D---E---F---G---H master\n>  ------------\n>  \n> \n> base-commit: 8b6f19ccfc3aefbd0f22f6b7d56ad6a3fc5e4f37\n> -- \n> gitgitgadget\n> \n> \n"},{"id":"522222","messageId":"xmqq1pqe7mlw.fsf@gitster.g","threadId":"63746","inReplyTo":"6518dd3b-ca05-1ce8-e700-81167cd2e88e@gmx.de","subject":"Re: [PATCH] docs: correct mistakes in git-merge","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-07-17T17:28:43Z","receivedAt":"2025-07-17T17:28:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n>> Additionally diagrams on the page are adjusted\n>> to use spaces instead of tabs, so that they align\n>> regardless of tab size. This is in line with\n>> diagrams on other git documentation pages.\n>\n> To be precise, you could add to the commit message that the faulty\n> description was introduced in 0c514d576685 (git-merge.txt: mention\n> 'ORIG_HEAD' in the Description, 2023-01-10). (I Cc:ed Philippe Blain who\n> authored that patch.)\n> ...\n>>  ------------\n>> -\t  A---B---C topic\n>> -\t /\n>> +          A---B---C topic\n>> +         /\n>\n> ... while correcting the description seemed fairly straight-forward, this\n> white-space change appears to tread on more delicate territory. It might\n> deserve its own patch\n> ...\n>> @@ -38,11 +38,11 @@ Then `git merge topic` will replay the changes made on the\n>>  its current commit (`C`) on top of `master`, and record the result\n>>  in a new commit along with the names of the two parent commits and\n>>  a log message from the user describing the changes. Before the operation,\n>> -`ORIG_HEAD` is set to the tip of the current branch (`C`).\n>> +`ORIG_HEAD` is set to the tip of the current branch (`G`).\n>\n> This is obviously a good fix.\n\nAll comments are good ones for contributors to keep in mind for\ntheir next attempt.\n\nFor this particular one, which is already in 'master', there is no\npoint in polishing and resending the patch, though ;-)\n\nThanks.\n"}]}