{"thread":{"id":"28853","subject":"[PATCH] pull: introduce a pull.rebase option to enable --rebase","startedAt":"2011-11-05T15:35:58Z","lastAt":"2011-11-07T18:48:51Z","messageCount":10,"participants":["Ævar Arnfjörð Bjarmason","Johannes Schindelin","Junio C Hamano","Sverre Rabbelier","Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"178904","messageId":"1320507358-3407-1-git-send-email-avarab@gmail.com","threadId":"28853","inReplyTo":null,"subject":"[PATCH] pull: introduce a pull.rebase option to enable --rebase","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2011-11-05T15:35:58Z","receivedAt":"2011-11-05T15:35:58Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Currently we either need to set branch..rebase for existing\nbranches if we'd like \"git pull\" to mean \"git pull --rebase\", or have\nthe forethought of setting \"branch.autosetuprebase\" before we create\nthe branch.\n\nBut there's no way to globally configure \"git pull\" to mean \"git pull\n--rebase\" for existing branches, introduce a \"pull.rebase\" option to\ndo that.\n\nThis option will be considered at a lower priority than\nbranch..rebase, i.e. we could set pull.rebase=true and\nbranch..rebase=false and the latter configuration option would\nwin.\n\nReviewed-by: Sverre Rabbelier \nReviewed-by: Fernando Vezzosi \nReviewed-by: Eric Herman \nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n Documentation/config.txt | 14 +++++++++++++-\n Documentation/git-pull.txt | 2 +-\n git-pull.sh | 4 ++++\n t/t5520-pull.sh | 24 ++++++++++++++++++++++--\n 4 files changed, 40 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 5a841da..b2d7d92 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -677,7 +677,9 @@ branch..mergeoptions::\n branch..rebase::\n \tWhen true, rebase the branch on top of the fetched branch,\n \tinstead of merging the default branch from the default remote when\n-\t\"git pull\" is run.\n+\t\"git pull\" is run. See \"pull.rebase\" for doing this in a non\n+\tbranch-specific manner.\n+\n \t*NOTE*: this is a possibly dangerous operation; do *not* use\n \tit unless you understand the implications (see linkgit:git-rebase[1]\n \tfor details).\n@@ -1590,6 +1592,16 @@ pretty.::\n \tNote that an alias with the same name as a built-in format\n \twill be silently ignored.\n \n+pull.rebase::\n+\tWhen true, rebase branches on top of the fetched branch, instead\n+\tof merging the default branch from the default remote when \"git\n+\tpull\" is run. See \"branch..rebase\" for setting this on a\n+\tper-branch basis.\n+\n+\t*NOTE*: this is a possibly dangerous operation; do *not* use\n+\tit unless you understand the implications (see linkgit:git-rebase[1]\n+\tfor details).\n+\n pull.octopus::\n \tThe default merge strategy to use when pulling multiple branches\n \tat once.\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex e1da468..0f18ec8 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -108,7 +108,7 @@ include::merge-options.txt[]\n \tfetched, the rebase uses that information to avoid rebasing\n \tnon-local changes.\n +\n-See `branch..rebase` and `branch.autosetuprebase` in\n+See `pull.rebase`, `branch..rebase` and `branch.autosetuprebase` in\n linkgit:git-config[1] if you want to make `git pull` always use\n `{litdd}rebase` instead of merging.\n +\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 9868a0b..24b6b7c 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -44,6 +44,10 @@ merge_args=\n curr_branch=$(git symbolic-ref -q HEAD)\n curr_branch_short=\"${curr_branch#refs/heads/}\"\n rebase=$(git config --bool branch.$curr_branch_short.rebase)\n+if test -z \"$rebase\"\n+then \n+\trebase=$(git config --bool pull.rebase)\n+fi\n dry_run=\n while :\n do\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 0e5eb67..ecc4fdc 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -94,16 +94,36 @@ test_expect_success '--rebase' '\n \ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n \ttest new = $(git show HEAD:file2)\n '\n+test_expect_success 'pull.rebase' '\n+\tgit reset --hard before-rebase &&\n+\tgit config --bool pull.rebase true &&\n+\ttest_when_finished \"git config --unset pull.rebase\" &&\n+\tgit pull . copy &&\n+\ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n+\ttest new = $(git show HEAD:file2)\n+'\n \n test_expect_success 'branch.to-rebase.rebase' '\n \tgit reset --hard before-rebase &&\n-\tgit config branch.to-rebase.rebase 1 &&\n+\tgit config --bool branch.to-rebase.rebase true &&\n+\ttest_when_finished \"git config --unset branch.to-rebase.rebase\" &&\n \tgit pull . copy &&\n-\tgit config branch.to-rebase.rebase 0 &&\n \ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n \ttest new = $(git show HEAD:file2)\n '\n \n+test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '\n+\tgit reset --hard before-rebase &&\n+\tgit config --bool pull.rebase true &&\n+\ttest_when_finished \"git config --unset pull.rebase\" &&\n+\tgit config --bool branch.to-rebase.rebase false &&\n+\ttest_when_finished \"git config --unset branch.to-rebase.rebase\" &&\n+\tgit pull . copy &&\n+\tgit config --unset branch.to-rebase.rebase &&\n+\ttest $(git rev-parse HEAD^) != $(git rev-parse copy) &&\n+\ttest new = $(git show HEAD:file2)\n+'\n+\n test_expect_success '--rebase with rebased upstream' '\n \n \tgit remote add -f me . &&\n-- \n1.7.7\n"},{"id":"178906","messageId":"alpine.DEB.1.00.1111051054380.32316@s15462909.onlinehome-server.info","threadId":"28853","inReplyTo":"1320507358-3407-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH] pull: introduce a pull.rebase option to enable --rebase","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2011-11-05T15:55:52Z","receivedAt":"2011-11-05T15:55:52Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 5 Nov 2011, Ævar Arnfjörð Bjarmason wrote:\n\n> Currently we either need to set branch..rebase for existing \n> branches if we'd like \"git pull\" to mean \"git pull --rebase\", or have \n> the forethought of setting \"branch.autosetuprebase\" before we create the \n> branch.\n> \n> But there's no way to globally configure \"git pull\" to mean \"git pull \n> --rebase\" for existing branches, introduce a \"pull.rebase\" option to do \n> that.\n> \n> This option will be considered at a lower priority than \n> branch..rebase, i.e. we could set pull.rebase=true and \n> branch..rebase=false and the latter configuration option would \n> win.\n\nNice.\n\nCiao,\nJohannes"},{"id":"178955","messageId":"7v8vnt7kvd.fsf@alter.siamese.dyndns.org","threadId":"28853","inReplyTo":"1320507358-3407-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH] pull: introduce a pull.rebase option to enable --rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-11-06T07:47:34Z","receivedAt":"2011-11-06T07:47:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> This option will be considered at a lower priority than\n> branch..rebase, i.e. we could set pull.rebase=true and\n> branch..rebase=false and the latter configuration option would\n> win.\n>\n> Reviewed-by: Sverre Rabbelier \n> Reviewed-by: Fernando Vezzosi \n> Reviewed-by: Eric Herman \n> Signed-off-by: Ævar Arnfjörð Bjarmason \n\nI see many reviewed-by lines, but what kind of review did this patch have,\nexactly? It seem to break its own test (branch.to-rebase.rebase should\noverride pull.rebase).\n\nI think I've queued most (if not all) of the patches in flight except for\nRam's sequencer reroll to 'pu' and pu^ passes the test but the tip of pu\ndoes not due to this topic.\n\nThanks for other topics from the Amsterdam together, by the way. I did not\ncomment on them individually but they looked mostly reasonable from a\nquick glance.\n"},{"id":"178957","messageId":"CAGdFq_hpp=NTJxYM=MNQOyGz73cRcxxWpYw93agDNgP72NAduA@mail.gmail.com","threadId":"28853","inReplyTo":"7v8vnt7kvd.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] pull: introduce a pull.rebase option to enable --rebase","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2011-11-06T09:23:28Z","receivedAt":"2011-11-06T09:23:28Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Sun, Nov 6, 2011 at 08:47, Junio C Hamano wrote:\n> I see many reviewed-by lines, but what kind of review did this patch have,\n> exactly? It seem to break its own test (branch.to-rebase.rebase should\n> override pull.rebase).\n\nWe looked at the patch the same way one would on list, and I assumed\nthat the tests passed. Ævar, did you sent a wrong version by accident\nperhaps?\n\n> Thanks for other topics from the Amsterdam together, by the way. I did not\n> comment on them individually but they looked mostly reasonable from a\n> quick glance.\n\nThanks.\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"178958","messageId":"1320573010-12296-1-git-send-email-avarab@gmail.com","threadId":"28853","inReplyTo":"7v8vnt7kvd.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2] pull: introduce a pull.rebase option to enable --rebase","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2011-11-06T09:50:10Z","receivedAt":"2011-11-06T09:50:10Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Currently we either need to set branch..rebase for existing\nbranches if we'd like \"git pull\" to mean \"git pull --rebase\", or have\nthe forethought of setting \"branch.autosetuprebase\" before we create\nthe branch.\n\nBut there's no way to globally configure \"git pull\" to mean \"git pull\n--rebase\" for existing branches, introduce a \"pull.rebase\" option to\ndo that.\n\nThis option will be considered at a lower priority than\nbranch..rebase, i.e. we could set pull.rebase=true and\nbranch..rebase=false and the latter configuration option would\nwin.\n\nReviewed-by: Sverre Rabbelier \nReviewed-by: Fernando Vezzosi \nReviewed-by: Eric Herman \nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n\nOn Sun, Nov 6, 2011 at 08:47, Junio C Hamano wrote:\n> Ævar Arnfjörð Bjarmason   writes:\n>\n>> This option will be considered at a lower priority than\n>> branch..rebase, i.e. we could set pull.rebase=true and\n>> branch..rebase=false and the latter configuration option would\n>> win.\n>>\n>> Reviewed-by: Sverre Rabbelier \n>> Reviewed-by: Fernando Vezzosi \n>> Reviewed-by: Eric Herman \n>> Signed-off-by: Ævar Arnfjörð Bjarmason \n>\n> I see many reviewed-by lines, but what kind of review did this patch have,\n> exactly? It seem to break its own test (branch.to-rebase.rebase should\n> override pull.rebase).\n\nWe all stood behind my laptop while I explained what it did and\nwhy. Sverre pointed out that I should use the test_when_finished()\nfunction for unsetting the config variables, Eric and Fernando looked\nit over as well.\n\n> I think I've queued most (if not all) of the patches in flight except for\n> Ram's sequencer reroll to 'pu' and pu^ passes the test but the tip of pu\n> does not due to this topic.\n\nDue to a trivial error of mine. I sent out the wrong patch as Sverre\nthought, the problem was that I was trying to --unset a config\nvariable twice, that's now fixed and the tests pass with this patch.\n\n Documentation/config.txt | 14 +++++++++++++-\n Documentation/git-pull.txt | 2 +-\n git-pull.sh | 4 ++++\n t/t5520-pull.sh | 23 +++++++++++++++++++++--\n 4 files changed, 39 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 5a841da..b2d7d92 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -677,7 +677,9 @@ branch..mergeoptions::\n branch..rebase::\n \tWhen true, rebase the branch on top of the fetched branch,\n \tinstead of merging the default branch from the default remote when\n-\t\"git pull\" is run.\n+\t\"git pull\" is run. See \"pull.rebase\" for doing this in a non\n+\tbranch-specific manner.\n+\n \t*NOTE*: this is a possibly dangerous operation; do *not* use\n \tit unless you understand the implications (see linkgit:git-rebase[1]\n \tfor details).\n@@ -1590,6 +1592,16 @@ pretty.::\n \tNote that an alias with the same name as a built-in format\n \twill be silently ignored.\n \n+pull.rebase::\n+\tWhen true, rebase branches on top of the fetched branch, instead\n+\tof merging the default branch from the default remote when \"git\n+\tpull\" is run. See \"branch..rebase\" for setting this on a\n+\tper-branch basis.\n+\n+\t*NOTE*: this is a possibly dangerous operation; do *not* use\n+\tit unless you understand the implications (see linkgit:git-rebase[1]\n+\tfor details).\n+\n pull.octopus::\n \tThe default merge strategy to use when pulling multiple branches\n \tat once.\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex e1da468..0f18ec8 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -108,7 +108,7 @@ include::merge-options.txt[]\n \tfetched, the rebase uses that information to avoid rebasing\n \tnon-local changes.\n +\n-See `branch..rebase` and `branch.autosetuprebase` in\n+See `pull.rebase`, `branch..rebase` and `branch.autosetuprebase` in\n linkgit:git-config[1] if you want to make `git pull` always use\n `{litdd}rebase` instead of merging.\n +\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 9868a0b..24b6b7c 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -44,6 +44,10 @@ merge_args=\n curr_branch=$(git symbolic-ref -q HEAD)\n curr_branch_short=\"${curr_branch#refs/heads/}\"\n rebase=$(git config --bool branch.$curr_branch_short.rebase)\n+if test -z \"$rebase\"\n+then \n+\trebase=$(git config --bool pull.rebase)\n+fi\n dry_run=\n while :\n do\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 0e5eb67..35304b4 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -94,16 +94,35 @@ test_expect_success '--rebase' '\n \ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n \ttest new = $(git show HEAD:file2)\n '\n+test_expect_success 'pull.rebase' '\n+\tgit reset --hard before-rebase &&\n+\tgit config --bool pull.rebase true &&\n+\ttest_when_finished \"git config --unset pull.rebase\" &&\n+\tgit pull . copy &&\n+\ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n+\ttest new = $(git show HEAD:file2)\n+'\n \n test_expect_success 'branch.to-rebase.rebase' '\n \tgit reset --hard before-rebase &&\n-\tgit config branch.to-rebase.rebase 1 &&\n+\tgit config --bool branch.to-rebase.rebase true &&\n+\ttest_when_finished \"git config --unset branch.to-rebase.rebase\" &&\n \tgit pull . copy &&\n-\tgit config branch.to-rebase.rebase 0 &&\n \ttest $(git rev-parse HEAD^) = $(git rev-parse copy) &&\n \ttest new = $(git show HEAD:file2)\n '\n \n+test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '\n+\tgit reset --hard before-rebase &&\n+\tgit config --bool pull.rebase true &&\n+\ttest_when_finished \"git config --unset pull.rebase\" &&\n+\tgit config --bool branch.to-rebase.rebase false &&\n+\ttest_when_finished \"git config --unset branch.to-rebase.rebase\" &&\n+\tgit pull . copy &&\n+\ttest $(git rev-parse HEAD^) != $(git rev-parse copy) &&\n+\ttest new = $(git show HEAD:file2)\n+'\n+\n test_expect_success '--rebase with rebased upstream' '\n \n \tgit remote add -f me . &&\n-- \n1.7.6.3\n"},{"id":"178971","messageId":"7v1utl6rk7.fsf@alter.siamese.dyndns.org","threadId":"28853","inReplyTo":"1320573010-12296-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-11-06T18:20:40Z","receivedAt":"2011-11-06T18:20:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> We all stood behind my laptop while I explained what it did and\n> why. Sverre pointed out that I should use the test_when_finished()\n> function for unsetting the config variables, Eric and Fernando looked\n> it over as well.\n\nSounds like fun ;-)\n\nWill re-queue. Thanks.\n"},{"id":"178980","messageId":"4EB6E5AD.7060605@kdbg.org","threadId":"28853","inReplyTo":"1320573010-12296-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2011-11-06T19:53:17Z","receivedAt":"2011-11-06T19:53:17Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 06.11.2011 10:50, schrieb Ævar Arnfjörð Bjarmason:\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index 5a841da..b2d7d92 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -677,7 +677,9 @@ branch..mergeoptions::\n> branch..rebase::\n> \tWhen true, rebase the branch on top of the fetched branch,\n> \tinstead of merging the default branch from the default remote when\n> -\t\"git pull\" is run.\n> +\t\"git pull\" is run. See \"pull.rebase\" for doing this in a non\n> +\tbranch-specific manner.\n> +\n> \t*NOTE*: this is a possibly dangerous operation; do *not* use\n> \tit unless you understand the implications (see linkgit:git-rebase[1]\n> \tfor details).\n\nWhen you continue an indented item in a separate paragraph, then you\nmust not use an empty line, but have line with '+' and un-indented\ncontinuation paragraphs. See examples in this file.\n\n-- Hannes\n"},{"id":"179032","messageId":"CACBZZX5Lq7vunx-QnsrufQVWJ6xYPoMXnv+tMwhOC3XbrZO11A@mail.gmail.com","threadId":"28853","inReplyTo":"4EB6E5AD.7060605@kdbg.org","subject":"Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2011-11-07T12:44:14Z","receivedAt":"2011-11-07T12:44:14Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Sun, Nov 6, 2011 at 20:53, Johannes Sixt wrote:\n> When you continue an indented item in a separate paragraph, then you\n> must not use an empty line, but have line with '+' and un-indented\n> continuation paragraphs. See examples in this file.\n\nThanks for spotting that.\n\nJunio: Should I spam you with another patch or is something you'd\nprefer to just fix up?\n"},{"id":"179046","messageId":"7v39dz3ms7.fsf@alter.siamese.dyndns.org","threadId":"28853","inReplyTo":"CACBZZX5Lq7vunx-QnsrufQVWJ6xYPoMXnv+tMwhOC3XbrZO11A@mail.gmail.com","subject":"Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-11-07T16:44:24Z","receivedAt":"2011-11-07T16:44:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> On Sun, Nov 6, 2011 at 20:53, Johannes Sixt wrote:\n>> When you continue an indented item in a separate paragraph, then you\n>> must not use an empty line, but have line with '+' and un-indented\n>> continuation paragraphs. See examples in this file.\n>\n> Thanks for spotting that.\n>\n> Junio: Should I spam you with another patch or is something you'd\n> prefer to just fix up?\n\nIt is about the same amount of work for me; I've just dedented the two\nparagraphs that start with \"*NOTE*:\" and replaced the blank lines before\nthem with a single \"+\". Is that what you wanted to resend, or is there\nanything else?\n"},{"id":"179062","messageId":"CACBZZX7igeXcuss2k3bPHrMP0U2JmbLAT-uQ0TvzZokofLqrJA@mail.gmail.com","threadId":"28853","inReplyTo":"7v39dz3ms7.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2011-11-07T18:48:51Z","receivedAt":"2011-11-07T18:48:51Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Mon, Nov 7, 2011 at 17:44, Junio C Hamano wrote:\n> Ævar Arnfjörð Bjarmason writes:\n>\n>> On Sun, Nov 6, 2011 at 20:53, Johannes Sixt wrote:\n>>> When you continue an indented item in a separate paragraph, then you\n>>> must not use an empty line, but have line with '+' and un-indented\n>>> continuation paragraphs. See examples in this file.\n>>\n>> Thanks for spotting that.\n>>\n>> Junio: Should I spam you with another patch or is something you'd\n>> prefer to just fix up?\n>\n> It is about the same amount of work for me; I've just dedented the two\n> paragraphs that start with \"*NOTE*:\" and replaced the blank lines before\n> them with a single \"+\". Is that what you wanted to resend, or is there\n> anything else?\n\nThat should cover it, thanks!\n"}]}