{"thread":{"id":"15320","subject":"[RFD] How to better document the \"two and three dots\" format","startedAt":"2008-09-01T12:43:51Z","lastAt":"2008-09-01T13:01:42Z","messageCount":3,"participants":["Paolo Ciarrocchi","Mikael Magnusson","Daniël Gressmann"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"89410","messageId":"4d8e3fd30809010543o1e1562c1s4466e191e782ddcc@mail.gmail.com","threadId":"15320","inReplyTo":null,"subject":"[RFD] How to better document the \"two and three dots\" format","fromName":"Paolo Ciarrocchi","fromEmail":"paolo.ciarrocchi@gmail.com","sentAt":"2008-09-01T12:43:51Z","receivedAt":"2008-09-01T12:43:51Z","isPatch":false,"sender":{"key":"paolo.ciarrocchi@gmail.com","avatar":null},"body":"Hi all,\nI'm looking in the existing documentation about some example and\nclarification about\nthe two and three dots formats applied to git diff.\n\nThe git-diff.txt file includes the following:\n\n---8<---\nComparing branches::\n+\n------------\n$ git diff topic master    <1>\n$ git diff topic..master   <2>\n$ git diff topic...master  <3>\n------------\n+\n<1> Changes between the tips of the topic and the master branches.\n<2> Same as above.\n<3> Changes that occurred on the master branch since when the topic\nbranch was started off it.\n---8<---\n\nI think <3> should be changed in something like:\n<3> Changes between the tips of the topic and the master branch that\noccurred since when the topic\nbranch was started off it.\n\nWhat do you think?\n\nI would like to add some graphical representation of <2> and <3> but\nI'm a bit loss\nwith <3> (and I guess lot of newbies are not really understanding that point).\nCan anybody come up with some ASCII art?\n\nThanks.\n\nCiao,\n-- \nPaolo\nhttp://paolo.ciarrocchi.googlepages.com/\n"},{"id":"89411","messageId":"237967ef0809010549n72629d47gfdf3c483f1a9e369@mail.gmail.com","threadId":"15320","inReplyTo":"4d8e3fd30809010543o1e1562c1s4466e191e782ddcc@mail.gmail.com","subject":"Re: [RFD] How to better document the \"two and three dots\" format","fromName":"Mikael Magnusson","fromEmail":"mikachu@gmail.com","sentAt":"2008-09-01T12:49:12Z","receivedAt":"2008-09-01T12:49:12Z","isPatch":false,"sender":{"key":"mikachu@gmail.com","avatar":null},"body":"2008/9/1 Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>:\n> Hi all,\n> I'm looking in the existing documentation about some example and\n> clarification about\n> the two and three dots formats applied to git diff.\n>\n> The git-diff.txt file includes the following:\n>\n> ---8<---\n> Comparing branches::\n> +\n> ------------\n> $ git diff topic master    <1>\n> $ git diff topic..master   <2>\n> $ git diff topic...master  <3>\n> ------------\n> +\n> <1> Changes between the tips of the topic and the master branches.\n> <2> Same as above.\n> <3> Changes that occurred on the master branch since when the topic\n> branch was started off it.\n> ---8<---\n>\n> I think <3> should be changed in something like:\n> <3> Changes between the tips of the topic and the master branch that\n> occurred since when the topic\n> branch was started off it.\n>\n> What do you think?\n\nYour proposed sentence is incorrect, the diff doesn't involve the tip\nof topic at all. It shows the diff between the merge-base and the tip\nof master. Ie, the combined diff of all the commits in the rev-list\nrange topic..master.\n\n> I would like to add some graphical representation of <2> and <3> but\n> I'm a bit loss\n> with <3> (and I guess lot of newbies are not really understanding that point).\n> Can anybody come up with some ASCII art?\n>\n> Thanks.\n>\n> Ciao,\n\n-- \nMikael Magnusson\n"},{"id":"89415","messageId":"48BBE7B6.9070709@procura.nl","threadId":"15320","inReplyTo":"4d8e3fd30809010543o1e1562c1s4466e191e782ddcc@mail.gmail.com","subject":"Re: [RFD] How to better document the \"two and three dots\" format","fromName":"Daniël Gressmann","fromEmail":"daniel@procura.nl","sentAt":"2008-09-01T13:01:42Z","receivedAt":"2008-09-01T13:01:42Z","isPatch":false,"sender":{"key":"daniel@procura.nl","avatar":null},"body":"Paolo Ciarrocchi wrote:\n> I think <3> should be changed in something like:\n> <3> Changes between the tips of the topic and the master branch that\n> occurred since when the topic\n> branch was started off it.\nI think it's a step in the proper direction. My take, as a newbie ;), at \nit would be more like:\n\n<3> Changes between the current tip of the topic and the tip of master \nbranch at the moment the topic branched off.\n\nI think the ASCII art explains why I think that way.\n> Can anybody come up with some ASCII art?\n>   \nASCII art <1> or <2>:\n--o--x\n   \\\n    -x\n\nASCII art <3>:\n\n--x---\n   \\\n    -x\n\nwhere the x marks the changes to be diffed\n\n-- \nPROCURA B.V.\n\nTel: (072) 571 25 05\nFax: (072) 571 71 02\n\nEmail: daniel@procura.nl\n\nPROCURA B.V. (statutair gevestigd in Heerhugowaard),\nHandelsregister Kamer van Koophandel Noordwest-Holland: 37140650\n \n"}]}