{"thread":{"id":"39244","subject":"--squash has no effect in git subtree push?","startedAt":"2015-05-04T13:58:00Z","lastAt":"2015-05-07T18:05:20Z","messageCount":3,"participants":["Danny Lin","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"260525","messageId":"CAMbsUu5g=r867_WOhLCySG3caKj1jhmQgfzBxK4TYV27+nUpsg@mail.gmail.com","threadId":"39244","inReplyTo":null,"subject":"--squash has no effect in git subtree push?","fromName":"Danny Lin","fromEmail":"danny0838@gmail.com","sentAt":"2015-05-04T13:58:00Z","receivedAt":"2015-05-04T13:58:00Z","isPatch":false,"sender":{"key":"danny0838@gmail.com","avatar":"https://avatars.githubusercontent.com/u/531417?v=4"},"body":"The document says that --squash is for 'add', 'merge', 'pull' and 'push'.\n\nHowever, it seems that --squash has no effect for push. Am I doing\nsomething wrong or is the document outdated?\n\ngit version 2.3.7.windows.1\n"},{"id":"260703","messageId":"CAMbsUu4v9w6+wiAUm2hpiNrDaoL3U9Z_suXR3NPVGo-JhH3E+Q@mail.gmail.com","threadId":"39244","inReplyTo":"CAMbsUu5g=r867_WOhLCySG3caKj1jhmQgfzBxK4TYV27+nUpsg@mail.gmail.com","subject":"Re: --squash has no effect in git subtree push?","fromName":"Danny Lin","fromEmail":"danny0838@gmail.com","sentAt":"2015-05-07T07:52:33Z","receivedAt":"2015-05-07T07:52:33Z","isPatch":false,"sender":{"key":"danny0838@gmail.com","avatar":"https://avatars.githubusercontent.com/u/531417?v=4"},"body":"Subject: [PATCH] contrib/subtree: there's no push --squash\n\nThe documentation says that --squash is for 'add', 'merge',\n'pull' and 'push', while --squash actually doesn't change\nthe behavior of 'push'. Correct the documentation.\n\nSigned-off-by: Danny Lin <danny0838@gmail.com>\n---\n contrib/subtree/git-subtree.sh  | 2 +-\n contrib/subtree/git-subtree.txt | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\nindex fa1a583..6328c87 100755\n--- a/contrib/subtree/git-subtree.sh\n+++ b/contrib/subtree/git-subtree.sh\n@@ -26,7 +26,7 @@ b,branch=     create a new branch from the split subtree\n ignore-joins  ignore prior --rejoin commits\n onto=         try connecting new tree to an existing one\n rejoin        merge the new branch back into HEAD\n- options for 'add', 'merge', 'pull' and 'push'\n+ options for 'add', 'merge', and 'pull'\n squash        merge subtree changes as a single commit\n \"\n eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\ndiff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\nindex 54e4b4a..60d76cd 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -146,7 +146,7 @@ OPTIONS\n OPTIONS FOR add, merge, push, pull\n ----------------------------------\n --squash::\n-    This option is only valid for add, merge, push and pull\n+    This option is only valid for add, merge, and pull\n     commands.\n +\n Instead of merging the entire history from the subtree project, produce\n-- \n2.3.7.windows.1\n"},{"id":"260759","messageId":"xmqqy4l0p8kf.fsf@gitster.dls.corp.google.com","threadId":"39244","inReplyTo":"CAMbsUu4v9w6+wiAUm2hpiNrDaoL3U9Z_suXR3NPVGo-JhH3E+Q@mail.gmail.com","subject":"Re: --squash has no effect in git subtree push?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-05-07T18:05:20Z","receivedAt":"2015-05-07T18:05:20Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Danny Lin <danny0838@gmail.com> writes:\n\n> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\n> index 54e4b4a..60d76cd 100644\n> --- a/contrib/subtree/git-subtree.txt\n> +++ b/contrib/subtree/git-subtree.txt\n> @@ -146,7 +146,7 @@ OPTIONS\n>  OPTIONS FOR add, merge, push, pull\n>  ----------------------------------\n>  --squash::\n> -    This option is only valid for add, merge, push and pull\n> +    This option is only valid for add, merge, and pull\n\nYou seem to have lost leading TABs in the patch somehow.\n\nI manually typed the same change and commited, so no need to resend\nthis one, but for future reference, please try sending a patch to\nyourself (and nobody else) and make sure what you reeived applies\ncleanly with \"git am\" on the commit you based your patch on.\n\nAnd if it doesn't, figure out where tabs are eaten and lines are\nwrapped and fix that problem before sending the patch to the list.\n\nThanks.\n"}]}