{"thread":{"id":"11252","subject":"git show stash","startedAt":"2007-12-12T07:28:36Z","lastAt":"2007-12-12T08:02:03Z","messageCount":3,"participants":["Mike Hommey","しらいしななこ"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"62863","messageId":"20071212072836.GA10961@glandium.org","threadId":"11252","inReplyTo":null,"subject":"git show stash","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2007-12-12T07:28:36Z","receivedAt":"2007-12-12T07:28:36Z","isPatch":false,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"Hi,\n\nIs there a particular reason why git show stash displays 2 signs at the\nbeginning of changed lines, contrary to git show anyotherref that shows\nonly one ? (the diff header is also different)\n\nMike\n"},{"id":"62864","messageId":"20071212073728.GA12058@glandium.org","threadId":"11252","inReplyTo":"20071212072836.GA10961@glandium.org","subject":"Re: git show stash","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2007-12-12T07:37:28Z","receivedAt":"2007-12-12T07:37:28Z","isPatch":false,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Wed, Dec 12, 2007 at 08:28:36AM +0100, Mike Hommey wrote:\n> Hi,\n> \n> Is there a particular reason why git show stash displays 2 signs at the\n> beginning of changed lines, contrary to git show anyotherref that shows\n> only one ? (the diff header is also different)\n\nI got a hint by opening my eyes: the stash is a merge commit (why is\nthat so, by the way ?).\n\nMike\n"},{"id":"62867","messageId":"200712120802.lBC82YDQ008276@mi1.bluebottle.com","threadId":"11252","inReplyTo":"20071212073728.GA12058@glandium.org","subject":"Re: git show stash","fromName":"しらいしななこ","fromEmail":"nanako3@bluebottle.com","sentAt":"2007-12-12T08:02:03Z","receivedAt":"2007-12-12T08:02:03Z","isPatch":false,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Mike Hommey <mh@glandium.org>:\n\n> On Wed, Dec 12, 2007 at 08:28:36AM +0100, Mike Hommey wrote:\n>> Hi,\n>> \n>> Is there a particular reason why git show stash displays 2 signs at the\n>> beginning of changed lines, contrary to git show anyotherref that shows\n>> only one ? (the diff header is also different)\n>\n> I got a hint by opening my eyes: the stash is a merge commit (why is\n> that so, by the way ?).\n\nBecause it needs to record changes between your HEAD and your index, and changes between your HEAD and your working files.\n\n              .-----STASH\n             /     /\n        HEAD ---INDEX\n\nA stash is a merge between your HEAD (first parent) and a commit that records your index state (second parent).  The latter commit is a child of your HEAD.  If you never run \"git add\" and always commit with \"git commit -a\", it is most likely that \"git stash show -p\" will show two plus signs or minus signs and nothing else, but if you use \"git add\" to add your changes incrementally to your index you will see the difference.\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n\n----------------------------------------------------------------------\nGet a free email address with REAL anti-spam protection.\nhttp://www.bluebottle.com/tag/1\n"}]}