{"thread":{"id":"19499","subject":"[PATCH] merge-options.txt: Clarify merge --squash","startedAt":"2009-05-25T16:00:10Z","lastAt":"2009-05-25T22:23:53Z","messageCount":2,"participants":["Michael J Gruber","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"114676","messageId":"1243267210-28997-1-git-send-email-git@drmicha.warpmail.net","threadId":"19499","inReplyTo":null,"subject":"[PATCH] merge-options.txt: Clarify merge --squash","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2009-05-25T16:00:10Z","receivedAt":"2009-05-25T16:00:10Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"With the --squash option, merge sets up the index just like for a real\nmerge, but without the merge info (stages). Say so.\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\nI think this kind of fell under the rug back then when it was discussed\n(http://permalink.gmane.org/gmane.comp.version-control.git/119185).\nSo I'm resending it.\n\nCheers,\nMichael\n\n Documentation/merge-options.txt |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex 637b53f..adadf8e 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -39,7 +39,8 @@\n \n --squash::\n \tProduce the working tree and index state as if a real\n-\tmerge happened, but do not actually make a commit or\n+\tmerge happened (except for the merge information),\n+\tbut do not actually make a commit or\n \tmove the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to\n \tcause the next `git commit` command to create a merge\n \tcommit.  This allows you to create a single commit on\n-- \n1.6.3.1.241.g24356\n"},{"id":"114711","messageId":"7v7i04vn2e.fsf@alter.siamese.dyndns.org","threadId":"19499","inReplyTo":"1243267210-28997-1-git-send-email-git@drmicha.warpmail.net","subject":"Re: [PATCH] merge-options.txt: Clarify merge --squash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-05-25T22:23:53Z","receivedAt":"2009-05-25T22:23:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}