{"thread":{"id":"15243","subject":"Subject: [PATCH] Update to the git tutorial","startedAt":"2008-08-28T12:23:52Z","lastAt":"2008-08-29T10:22:19Z","messageCount":2,"participants":["Paolo Ciarrocchi"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"88875","messageId":"48B698D8.6080300@vodafone.com","threadId":"15243","inReplyTo":null,"subject":"Subject: [PATCH] Update to the git tutorial","fromName":"Paolo Ciarrocchi","fromEmail":"paolo.ciarrocchi@vodafone.com","sentAt":"2008-08-28T12:23:52Z","receivedAt":"2008-08-28T12:23:52Z","isPatch":true,"sender":{"key":"paolo.ciarrocchi@vodafone.com","avatar":null},"body":"From: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n\nUpdate to gitutorial as discussedin the git mailing list:\n\nhttp://marc.info/?t=121969390900002&r=1&w=2\n\nSigned-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n---\n Documentation/gittutorial.txt |   29 ++++++++++++++++++++++++++++-\n 1 files changed, 28 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt\nindex 48d1454..384972c 100644\n--- a/Documentation/gittutorial.txt\n+++ b/Documentation/gittutorial.txt\n@@ -321,10 +321,37 @@ pulling, like this:\n \n ------------------------------------------------\n alice$ git fetch /home/bob/myrepo master\n-alice$ git log -p ..FETCH_HEAD\n+alice$ git log -p HEAD..FETCH_HEAD\n ------------------------------------------------\n \n This operation is safe even if Alice has uncommitted local changes.\n+The range notation HEAD..FETCH_HEAD\" means \"show everything that is reachable\n+from the FETCH_HEAD but exclude anything that is reachable from HEAD.\n+Alice already knows everything that leads to her current state (HEAD),\n+and reviewing what Bob has in his state (FETCH_HEAD) that she has not\n+seen with this command\n+\n+If Alice wants to visualize what Bob did since their histories forked\n+she can issue the following command:\n+\n+------------------------------------------------\n+$ gitk HEAD..FETCH_HEAD\n+------------------------------------------------\n+\n+This uses the same two-dot range notation we saw earlier with 'git log'.\n+\n+Alice may want to view what both of them did since they forked.\n+She can use three-dot form instead of the two-dot form:\n+\n+------------------------------------------------\n+$ gitk HEAD...FETCH_HEAD\n+------------------------------------------------\n+\n+This means \"show everything that is reachable from either one, but\n+exclude anything that is reachable from both of them\".\n+\n+Please note that these range notation can be used with both gitk\n+and \"git log\".\n \n After inspecting what Bob did, if there is nothing urgent, Alice may\n decide to continue working without pulling from Bob.  If Bob's history\n-- \n1.5.6.1.1071.g76fb\n"},{"id":"89116","messageId":"4d8e3fd30808290322o66764cb2tafaf91ff86ca7b4c@mail.gmail.com","threadId":"15243","inReplyTo":"48B698D8.6080300@vodafone.com","subject":"Re: Subject: [PATCH] Update to the git tutorial","fromName":"Paolo Ciarrocchi","fromEmail":"paolo.ciarrocchi@gmail.com","sentAt":"2008-08-29T10:22:19Z","receivedAt":"2008-08-29T10:22:19Z","isPatch":true,"sender":{"key":"paolo.ciarrocchi@gmail.com","avatar":null},"body":"On Thu, Aug 28, 2008 at 2:23 PM, Paolo Ciarrocchi\n<paolo.ciarrocchi@vodafone.com> wrote:\n> From: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n>\n> Update to gitutorial as discussedin the git mailing list:\n>\n> http://marc.info/?t=121969390900002&r=1&w=2\n>\n> Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n> ---\n>  Documentation/gittutorial.txt |   29 ++++++++++++++++++++++++++++-\n>  1 files changed, 28 insertions(+), 1 deletions(-)\n\nNice to see that you pick up the patch (with the right correction to\nmy poor changelog :-/).\n\nBTW, I made the patch with msysgit on win, MUA is Thunderbird and\neditor is Notepad++.\nIt might be a good idea to adjust CodingGuidelines since there might\nbe other win contributors.\n\nciao,\n-- \nPaolo\nhttp://paolo.ciarrocchi.googlepages.com/\n"}]}