{"thread":{"id":"54051","subject":"[PATCH] Fix --squash for push in subtree doc.","startedAt":"2020-08-15T21:57:37Z","lastAt":"2020-08-18T19:13:12Z","messageCount":4,"participants":["Danny Lin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"403752","messageId":"20200815023702.905-1-danny0838@gmail.com","threadId":"54051","inReplyTo":null,"subject":"[PATCH] Fix --squash for push in subtree doc.","fromName":"Danny Lin","fromEmail":"danny0838@gmail.com","sentAt":"2020-08-15T02:37:03Z","receivedAt":"2020-08-15T21:57:37Z","isPatch":true,"sender":{"key":"danny0838@gmail.com","avatar":"https://avatars.githubusercontent.com/u/531417?v=4"},"body":"git subtree push does not support --squash, as previously illustrated in\nrevision 6ccc71a9d02726d59c1de818febf85a836f4e418.\n\nSigned-off-by: Danny Lin <danny0838@gmail.com>\n---\n contrib/subtree/git-subtree.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\nindex 9ccd431c7f..0db02fe3c0 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -143,8 +143,8 @@ OPTIONS\n \tSpecify <message> as the commit message for the merge commit.\n \n \n-OPTIONS FOR add, merge, push, pull\n-----------------------------------\n+OPTIONS FOR add, merge, and pull\n+--------------------------------\n --squash::\n \tThis option is only valid for add, merge, and pull\n \tcommands.\n-- \n2.28.0.windows.1\n\n"},{"id":"403831","messageId":"xmqqzh6t2p43.fsf@gitster.c.googlers.com","threadId":"54051","inReplyTo":"20200815023702.905-1-danny0838@gmail.com","subject":"Re: [PATCH] Fix --squash for push in subtree doc.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-17T16:50:36Z","receivedAt":"2020-08-17T16:50:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Danny Lin <danny0838@gmail.com> writes:\n\n> Subject: Re: [PATCH] Fix --squash for push in subtree doc.\n\nDitto.  Perhaps\n\n\tSubject: contrib/subtree: document 'push' does not take '--squash'\n\nor something?\n\n> git subtree push does not support --squash, as previously illustrated in\n> revision 6ccc71a9d02726d59c1de818febf85a836f4e418.\n\nDocumentation/SubmittingPatches[[commit-reference]]\n\n\"..., as previously illustrated in 6ccc71a9 (contrib/subtree:\nthere's no push --squash, 2015-05-07)\"\n\n`>\n> Signed-off-by: Danny Lin <danny0838@gmail.com>\n> ---\n>  contrib/subtree/git-subtree.txt | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\n> index 9ccd431c7f..0db02fe3c0 100644\n> --- a/contrib/subtree/git-subtree.txt\n> +++ b/contrib/subtree/git-subtree.txt\n> @@ -143,8 +143,8 @@ OPTIONS\n>  \tSpecify <message> as the commit message for the merge commit.\n>  \n>  \n> -OPTIONS FOR add, merge, push, pull\n> -----------------------------------\n> +OPTIONS FOR add, merge, and pull\n> +--------------------------------\n\n"},{"id":"403921","messageId":"20200818052248.1880-1-danny0838@gmail.com","threadId":"54051","inReplyTo":"xmqqzh6t2p43.fsf@gitster.c.googlers.com","subject":"[PATCH] contrib/subtree: document 'push' does not take '--squash'","fromName":"Danny Lin","fromEmail":"danny0838@gmail.com","sentAt":"2020-08-18T05:22:49Z","receivedAt":"2020-08-18T05:23:33Z","isPatch":true,"sender":{"key":"danny0838@gmail.com","avatar":"https://avatars.githubusercontent.com/u/531417?v=4"},"body":"git subtree push does not support --squash, as previously illustrated in\n6ccc71a9 (contrib/subtree: there's no push --squash, 2015-05-07)\n\nSigned-off-by: Danny Lin <danny0838@gmail.com>\n---\n contrib/subtree/git-subtree.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\nindex 9ccd431c7f..0db02fe3c0 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -143,8 +143,8 @@ OPTIONS\n \tSpecify <message> as the commit message for the merge commit.\n \n \n-OPTIONS FOR add, merge, push, pull\n-----------------------------------\n+OPTIONS FOR add, merge, and pull\n+--------------------------------\n --squash::\n \tThis option is only valid for add, merge, and pull\n \tcommands.\n-- \n2.28.0.windows.1\n\n"},{"id":"403963","messageId":"xmqqwo1vydhc.fsf@gitster.c.googlers.com","threadId":"54051","inReplyTo":"20200818052248.1880-1-danny0838@gmail.com","subject":"Re: [PATCH] contrib/subtree: document 'push' does not take '--squash'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-18T19:13:03Z","receivedAt":"2020-08-18T19:13:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Danny Lin <danny0838@gmail.com> writes:\n\n> git subtree push does not support --squash, as previously illustrated in\n> 6ccc71a9 (contrib/subtree: there's no push --squash, 2015-05-07)\n>\n> Signed-off-by: Danny Lin <danny0838@gmail.com>\n> ---\n>  contrib/subtree/git-subtree.txt | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n\nThanks.  Will queue both patches.\n\n\n> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\n> index 9ccd431c7f..0db02fe3c0 100644\n> --- a/contrib/subtree/git-subtree.txt\n> +++ b/contrib/subtree/git-subtree.txt\n> @@ -143,8 +143,8 @@ OPTIONS\n>  \tSpecify <message> as the commit message for the merge commit.\n>  \n>  \n> -OPTIONS FOR add, merge, push, pull\n> -----------------------------------\n> +OPTIONS FOR add, merge, and pull\n> +--------------------------------\n>  --squash::\n>  \tThis option is only valid for add, merge, and pull\n>  \tcommands.\n"}]}