{"thread":{"id":"13250","subject":"Branch \"ahead of tracked remote branch\"","startedAt":"2008-04-25T02:03:18Z","lastAt":"2008-04-25T16:39:40Z","messageCount":3,"participants":["Bill Lear","Daniel Barkalow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"75165","messageId":"18449.15334.88706.45152@lisa.zopyra.com","threadId":"13250","inReplyTo":null,"subject":"Branch \"ahead of tracked remote branch\"","fromName":"Bill Lear","fromEmail":"rael@zopyra.com","sentAt":"2008-04-25T02:03:18Z","receivedAt":"2008-04-25T02:03:18Z","isPatch":false,"sender":{"key":"rael@zopyra.com","avatar":"https://gravatar.com/avatar/c4f2d2790ca3828d3b4e7dfebabf61d2fe94fd82fa49cdac2a5295dd2d46a874?d=mp&s=160"},"body":"I had some work in master, I decided to move to a branch to complete,\nso:\n\n% git checkout -b branch\n% git commit -a -m \"Insightful message\"\n\nThen, I decided this was not such a good idea, so I did a git reset\n--soft HEAD^, then git reset HEAD for each file I committed, thinking\nthat this was a complete \"undo\".  I then switched to branch master\nand got this:\n\nSwitched to branch \"master\"\nYour branch is ahead of the tracked remote branch 'origin/master' by 1 commit.\n\nI'm not sure this is accurate.  Does this seem correct?\n\n\nBill\n"},{"id":"75166","messageId":"alpine.LNX.1.00.0804242349460.19665@iabervon.org","threadId":"13250","inReplyTo":"18449.15334.88706.45152@lisa.zopyra.com","subject":"Re: Branch \"ahead of tracked remote branch\"","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-04-25T03:59:44Z","receivedAt":"2008-04-25T03:59:44Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Thu, 24 Apr 2008, Bill Lear wrote:\n\n> I had some work in master, I decided to move to a branch to complete,\n> so:\n> \n> % git checkout -b branch\n> % git commit -a -m \"Insightful message\"\n> \n> Then, I decided this was not such a good idea, so I did a git reset\n> --soft HEAD^, then git reset HEAD for each file I committed, thinking\n> that this was a complete \"undo\".  I then switched to branch master\n> and got this:\n> \n> Switched to branch \"master\"\n> Your branch is ahead of the tracked remote branch 'origin/master' by 1 commit.\n> \n> I'm not sure this is accurate.  Does this seem correct?\n\nIt's certainly possible. It looks like you committed once on your own \nmaster branch before you did any of the things mentioned in this message. \nThen you created a new branch, made a commit on it, undid the commit, and \nswitched back to \"master\". \"git log origin/master..master\" will show you \nthe 1 commit that you have on master.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"},{"id":"75184","messageId":"18450.2380.655635.387709@lisa.zopyra.com","threadId":"13250","inReplyTo":"alpine.LNX.1.00.0804242349460.19665@iabervon.org","subject":"Re: Branch \"ahead of tracked remote branch\"","fromName":"Bill Lear","fromEmail":"rael@zopyra.com","sentAt":"2008-04-25T16:39:40Z","receivedAt":"2008-04-25T16:39:40Z","isPatch":false,"sender":{"key":"rael@zopyra.com","avatar":"https://gravatar.com/avatar/c4f2d2790ca3828d3b4e7dfebabf61d2fe94fd82fa49cdac2a5295dd2d46a874?d=mp&s=160"},"body":"On Thursday, April 24, 2008 at 23:59:44 (-0400) Daniel Barkalow writes:\n>On Thu, 24 Apr 2008, Bill Lear wrote:\n>\n>> I had some work in master, I decided to move to a branch to complete,\n>> so:\n>> \n>> % git checkout -b branch\n>> % git commit -a -m \"Insightful message\"\n>> \n>> Then, I decided this was not such a good idea, so I did a git reset\n>> --soft HEAD^, then git reset HEAD for each file I committed, thinking\n>> that this was a complete \"undo\".  I then switched to branch master\n>> and got this:\n>> \n>> Switched to branch \"master\"\n>> Your branch is ahead of the tracked remote branch 'origin/master' by 1 commit.\n>> \n>> I'm not sure this is accurate.  Does this seem correct?\n>\n>It's certainly possible. It looks like you committed once on your own \n>master branch before you did any of the things mentioned in this message. \n>Then you created a new branch, made a commit on it, undid the commit, and \n>switched back to \"master\". \"git log origin/master..master\" will show you \n>the 1 commit that you have on master.\n\nAh, ok, now I think I understand --- if I do a fetch (or pull) on\nmaster, switch over to the other branch, and then back, I see no such\nmessage.  Thanks.\n\n\nBill\n"}]}