{"thread":{"id":"52230","subject":"[PATCH] doc: improve readability of --rebase-merges in git-rebase","startedAt":"2019-11-10T09:59:52Z","lastAt":"2019-11-12T04:18:22Z","messageCount":6,"participants":["Naveen Nathan","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"385846","messageId":"20191110095942.GB6071@a.local","threadId":"52230","inReplyTo":null,"subject":"[PATCH] doc: improve readability of --rebase-merges in git-rebase","fromName":"Naveen Nathan","fromEmail":"naveen@lastninja.net","sentAt":"2019-11-10T09:59:42Z","receivedAt":"2019-11-10T09:59:52Z","isPatch":true,"sender":{"key":"naveen@lastninja.net","avatar":"https://avatars.githubusercontent.com/u/319907?v=4"},"body":"When --rebase-merges was introduced in 427c3bd28a the sentence\ndescribing the difference between --rebase-merges and --preserve-merges\nis a little unclear and difficult to parse. This patch improves readability\nwhile retaining original meaning.\n\nSigned-off-by: Naveen Nathan \n---\n Documentation/git-rebase.txt | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 639a4179d1..6a826b47bd 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -442,9 +442,9 @@ i.e. commits that would be excluded by linkgit:git-log[1]'s\n the `rebase-cousins` mode is turned on, such commits are instead rebased\n onto `` (or ``, if specified).\n +\n-The `--rebase-merges` mode is similar in spirit to the deprecated\n-`--preserve-merges`, but in contrast to that option works well in interactive\n-rebases: commits can be reordered, inserted and dropped at will.\n+The `--rebase-merges` mode is similar in spirit to `--preserve-merges`\n+(deprecated) but actually works with interactive rebases, where commits\n+can be reordered, inserted and dropped at will.\n +\n It is currently only possible to recreate the merge commits using the\n `recursive` merge strategy; Different merge strategies can be used only via\n-- \n2.21.0\n\n"},{"id":"385892","messageId":"nycvar.QRO.7.76.6.1911110948270.46@tvgsbejvaqbjf.bet","threadId":"52230","inReplyTo":"20191110095942.GB6071@a.local","subject":"Re: [PATCH] doc: improve readability of --rebase-merges in git-rebase","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-11-11T08:49:24Z","receivedAt":"2019-11-11T08:49:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Naveen,\n\nOn Sun, 10 Nov 2019, Naveen Nathan wrote:\n\n> When --rebase-merges was introduced in 427c3bd28a the sentence\n> describing the difference between --rebase-merges and --preserve-merges\n> is a little unclear and difficult to parse. This patch improves readability\n> while retaining original meaning.\n>\n> Signed-off-by: Naveen Nathan \n> ---\n> Documentation/git-rebase.txt | 6 +++---\n> 1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index 639a4179d1..6a826b47bd 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -442,9 +442,9 @@ i.e. commits that would be excluded by linkgit:git-log[1]'s\n> the `rebase-cousins` mode is turned on, such commits are instead rebased\n> onto `` (or ``, if specified).\n> +\n> -The `--rebase-merges` mode is similar in spirit to the deprecated\n> -`--preserve-merges`, but in contrast to that option works well in interactive\n> -rebases: commits can be reordered, inserted and dropped at will.\n> +The `--rebase-merges` mode is similar in spirit to `--preserve-merges`\n> +(deprecated) but actually works with interactive rebases, where commits\n> +can be reordered, inserted and dropped at will.\n\nI like it!\n\nACK,\nDscho\n\n> +\n> It is currently only possible to recreate the merge commits using the\n> `recursive` merge strategy; Different merge strategies can be used only via\n> --\n> 2.21.0\n>\n>\n>\n"},{"id":"385898","messageId":"xmqqr22ehjbg.fsf@gitster-ct.c.googlers.com","threadId":"52230","inReplyTo":"20191110095942.GB6071@a.local","subject":"Re: [PATCH] doc: improve readability of --rebase-merges in git-rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-11T09:08:03Z","receivedAt":"2019-11-11T09:08:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Naveen Nathan writes:\n\n> When --rebase-merges was introduced in 427c3bd28a the sentence\n> describing the difference between --rebase-merges and --preserve-merges\n> is a little unclear and difficult to parse. This patch improves readability\n> while retaining original meaning.\n>\n> ...\n> -The `--rebase-merges` mode is similar in spirit to the deprecated\n> -`--preserve-merges`, but in contrast to that option works well in interactive\n> -rebases: commits can be reordered, inserted and dropped at will.\n> +The `--rebase-merges` mode is similar in spirit to `--preserve-merges`\n> +(deprecated) but actually works with interactive rebases, where commits\n> +can be reordered, inserted and dropped at will.\n\nI think the original \"to the deprecated `--preserve-merges`\" is\nmildly easier to follow than \"to `--preserve-merges` (deprecated)\".\n\nThe later part of the sentence with this patch does read smoother\nand is a definite improvement.\n\nThanks.\n\n"},{"id":"385950","messageId":"556b38ff-a118-43b3-8024-cf6dd97253ff@www.fastmail.com","threadId":"52230","inReplyTo":"xmqqr22ehjbg.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] doc: improve readability of --rebase-merges in git-rebase","fromName":"Naveen Nathan","fromEmail":"naveen@lastninja.net","sentAt":"2019-11-11T21:44:54Z","receivedAt":"2019-11-11T21:45:18Z","isPatch":true,"sender":{"key":"naveen@lastninja.net","avatar":"https://avatars.githubusercontent.com/u/319907?v=4"},"body":"> I think the original \"to the deprecated `--preserve-merges`\" is\n> mildly easier to follow than \"to `--preserve-merges` (deprecated)\".\n> \n> The later part of the sentence with this patch does read smoother\n> and is a definite improvement.\n\nThanks Junio.\n\nI've incorporated the suggestion and will submit a new patch shortly.\n\n- Naveen\n"},{"id":"385953","messageId":"20191111232137.GA29586@a.local","threadId":"52230","inReplyTo":"xmqqr22ehjbg.fsf@gitster-ct.c.googlers.com","subject":"[PATCH v2] doc: improve readability of --rebase-merges in git-rebase","fromName":"Naveen Nathan","fromEmail":"naveen@lastninja.net","sentAt":"2019-11-11T23:21:37Z","receivedAt":"2019-11-11T23:21:44Z","isPatch":true,"sender":{"key":"naveen@lastninja.net","avatar":"https://avatars.githubusercontent.com/u/319907?v=4"},"body":"When --preserve-merges was deprecated in 427c3bd28a a sentence\nwas introduced describing the difference between --rebase-merges and\n--preserve-merges which is a little unclear and difficult to parse.\nThis patch improves readability while retaining original meaning.\n\nSigned-off-by: Naveen Nathan \n---\n Documentation/git-rebase.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 639a4179d1..0c4f038dd6 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -443,8 +443,8 @@ the `rebase-cousins` mode is turned on, such commits are instead rebased\n onto `` (or ``, if specified).\n +\n The `--rebase-merges` mode is similar in spirit to the deprecated\n-`--preserve-merges`, but in contrast to that option works well in interactive\n-rebases: commits can be reordered, inserted and dropped at will.\n+`--preserve-merges` but works with interactive rebases,\n+where commits can be reordered, inserted and dropped at will.\n +\n It is currently only possible to recreate the merge commits using the\n `recursive` merge strategy; Different merge strategies can be used only via\n-- \n2.21.0\n\n"},{"id":"385976","messageId":"xmqqy2wlg22e.fsf@gitster-ct.c.googlers.com","threadId":"52230","inReplyTo":"20191111232137.GA29586@a.local","subject":"Re: [PATCH v2] doc: improve readability of --rebase-merges in git-rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-12T04:18:17Z","receivedAt":"2019-11-12T04:18:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Naveen Nathan writes:\n\n> When --preserve-merges was deprecated in 427c3bd28a a sentence\n> was introduced describing the difference between --rebase-merges and\n> --preserve-merges which is a little unclear and difficult to parse.\n> This patch improves readability while retaining original meaning.\n\nI notice that the above also was rewritten since v1 and I think it\nis a very good change.\n\nThanks, will queue.\n"}]}