{"thread":{"id":"21228","subject":"How do I see all of my changes on a branch?","startedAt":"2009-10-13T19:40:19Z","lastAt":"2009-10-28T12:08:21Z","messageCount":3,"participants":["jonhud","Shawn O. Pearce","Tim Mazid"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"124877","messageId":"25879435.post@talk.nabble.com","threadId":"21228","inReplyTo":null,"subject":"How do I see all of my changes on a branch?","fromName":"jonhud","fromEmail":"jon@huddler-inc.com","sentAt":"2009-10-13T19:40:19Z","receivedAt":"2009-10-13T19:40:19Z","isPatch":false,"sender":{"key":"jon@huddler-inc.com","avatar":null},"body":"\nHi,\n\nWe are using github (but that's more or less irrelevant, since I'm just\nrunning git 1.6 locally on Ubuntu). Some time ago, I created a new branch\n(release.2.2) and pushed it out to the remote repository. All the digging\nthrough log, gitk, etc. has not made it possible for me to figure out the\ncommit (or point in time) at which I cut the branch. \n\nWhat I want to do is to get a list of files (and/or diffs for those files)\nfrom that point in time to HEAD on the branch. I understand that git-diff\n--name-only is part of the solution. What I can't figure out is how to\npinpoint the first commit. So that's my first question... how do I do that?\n\nTo complicate things, I was also working on a side branch which I merged to\nmaster before cutting the release.2.2 branch. In the best of all worlds, I\nwould trace my changes back to the point at which I cut *that* branch and\nfollow through the HEAD of release.2.2. How do I do that? I know I might\nhave to take 2 passes, one for release 2.2 and one for the side branch and\nthat's OK.\n\nThanks!\n\nJon\n-- \nView this message in context: http://www.nabble.com/How-do-I-see-all-of-my-changes-on-a-branch--tp25879435p25879435.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"124887","messageId":"20091013202300.GC9261@spearce.org","threadId":"21228","inReplyTo":"25879435.post@talk.nabble.com","subject":"Re: How do I see all of my changes on a branch?","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-10-13T20:23:00Z","receivedAt":"2009-10-13T20:23:00Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"jonhud <jon@huddler-inc.com> wrote:\n> We are using github (but that's more or less irrelevant, since I'm just\n> running git 1.6 locally on Ubuntu). Some time ago, I created a new branch\n> (release.2.2) and pushed it out to the remote repository. All the digging\n> through log, gitk, etc. has not made it possible for me to figure out the\n> commit (or point in time) at which I cut the branch. \n\ngit merge-base release2.2 HEAD\n\nWhich really lets you do:\n\n  git diff $(git merge-base release.2.2 HEAD) HEAD\n\nWhich is the long form of:\n\n  git diff release-2.2...HEAD\n\n(diff triple dot operator does the merge base computation for you).\n \n-- \nShawn.\n"},{"id":"126130","messageId":"26093515.post@talk.nabble.com","threadId":"21228","inReplyTo":"25879435.post@talk.nabble.com","subject":"Re: How do I see all of my changes on a branch?","fromName":"Tim Mazid","fromEmail":"timmazid@hotmail.com","sentAt":"2009-10-28T12:08:21Z","receivedAt":"2009-10-28T12:08:21Z","isPatch":false,"sender":{"key":"timmazid@hotmail.com","avatar":null},"body":"\n\njonhud wrote:\n> \n> Hi,\n> \n> We are using github (but that's more or less irrelevant, since I'm just\n> running git 1.6 locally on Ubuntu). Some time ago, I created a new branch\n> (release.2.2) and pushed it out to the remote repository. All the digging\n> through log, gitk, etc. has not made it possible for me to figure out the\n> commit (or point in time) at which I cut the branch. \n> \n\nUm, unfortunately, all the commits that are prior to HEAD count as being on\nthe branch.\nHave you tried using 'gitk --all' to look through? You should be able to see\nthe split point there.\n\n\njonhud wrote:\n> \n> What I want to do is to get a list of files (and/or diffs for those files)\n> from that point in time to HEAD on the branch. I understand that git-diff\n> --name-only is part of the solution. What I can't figure out is how to\n> pinpoint the first commit. So that's my first question... how do I do\n> that?\n> \n\nOnce you've found the commit, you can 'git diff COMMIT', or you can even,\nstraight in gitk, (make sure you have your branch selected), right click on\nthe commit and select 'diff this->selected'.\n\n\njonhud wrote:\n> \n> To complicate things, I was also working on a side branch which I merged\n> to master before cutting the release.2.2 branch. In the best of all\n> worlds, I would trace my changes back to the point at which I cut *that*\n> branch and follow through the HEAD of release.2.2. How do I do that? I\n> know I might have to take 2 passes, one for release 2.2 and one for the\n> side branch and that's OK.\n> \n> Thanks!\n> \n> Jon\n> \n\nThe same method should work for that as well.\n\nGood luck,\nTim.\n-- \nView this message in context: http://www.nabble.com/How-do-I-see-all-of-my-changes-on-a-branch--tp25879435p26093515.html\nSent from the git mailing list archive at Nabble.com.\n"}]}