{"thread":{"id":"15114","subject":"Local branch ahead of tracked remote branch but git push claims everything up-to-date","startedAt":"2008-08-20T20:26:09Z","lastAt":"2008-08-22T14:09:19Z","messageCount":13,"participants":["ir0s","Alex Riesen","Andreas Färber","Avery Pennarun","Junio C Hamano","Daniel Barkalow","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"87867","messageId":"1219263969579-736663.post@n2.nabble.com","threadId":"15114","inReplyTo":null,"subject":"Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"ir0s","fromEmail":"imirene@gmail.com","sentAt":"2008-08-20T20:26:09Z","receivedAt":"2008-08-20T20:26:09Z","isPatch":false,"sender":{"key":"imirene@gmail.com","avatar":"https://gravatar.com/avatar/e9fb5f68e8909109c399883040a4ee1cc9e64149ce86d05d824669bdfd87a3ac?d=mp&s=160"},"body":"\nHello,\n\nI've used git for quite some time now but haven't run into this kind of\nissue before.\n\nI created a new branch from a remote branch that me and another developer\nshare:\n$ git checkout --track -b mybranch origin/remotebranch\n\nI make some changes, commit them but then switch to another branch and do\nsome work there. \n\nI return to checkout my new branch to do some work:\n$ git checkout mybranch \nSwitched to branch \"mybranch \"\nYour branch is ahead of the tracked remote branch 'origin/remotebranch' by 4\ncommits.\nmybranch \n\nAccurately, it has 4 commits that I haven't pushed yet. I try to push them\nbut I get the following:\n$ git push origin remotebranch\nEverything up-to-date\n\nAny ideas? This is really strange. Clearly I have missing commits, my\nteammate doesn't see those 4 when he pulls and yet I can't add them.\n\n>From my git config:\n\n[branch \"mybranch\"]\n\tremote = origin\n\tmerge = refs/heads/remotebranch\n-- \nView this message in context: http://n2.nabble.com/Local-branch-ahead-of-tracked-remote-branch-but-git-push-claims-everything-up-to-date-tp736663p736663.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"87871","messageId":"20080820203758.GI16626@blimp.local","threadId":"15114","inReplyTo":"1219263969579-736663.post@n2.nabble.com","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2008-08-20T20:37:58Z","receivedAt":"2008-08-20T20:37:58Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"ir0s, Wed, Aug 20, 2008 22:26:09 +0200:\n> $ git push origin remotebranch\n> Everything up-to-date\n\nJust (assuming that tracking information is correct)\n\n git push\n\nor (if you want to be absolutely sure, and be able to find and\nunderstand the fact afterwards in your shells history)\n\n git push origin HEAD:remotebranch\n"},{"id":"87873","messageId":"8585F10E-C33C-481E-B044-A7125F3316F2@web.de","threadId":"15114","inReplyTo":"1219263969579-736663.post@n2.nabble.com","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Andreas Färber","fromEmail":"andreas.faerber@web.de","sentAt":"2008-08-20T20:40:46Z","receivedAt":"2008-08-20T20:40:46Z","isPatch":false,"sender":{"key":"andreas.faerber@web.de","avatar":"https://gravatar.com/avatar/ac719235a76c4a5e248080fee1f7b6f507bdb1f3d71f7ae48457f3ead91ed1c0?d=mp&s=160"},"body":"Hello,\n\nAm 20.08.2008 um 22:26 schrieb ir0s:\n\n> $ git checkout mybranch\n> Switched to branch \"mybranch \"\n> Your branch is ahead of the tracked remote branch 'origin/ \n> remotebranch' by 4\n> commits.\n> mybranch\n>\n> Accurately, it has 4 commits that I haven't pushed yet. I try to \n> push them\n> but I get the following:\n> $ git push origin remotebranch\n> Everything up-to-date\n>\n> Any ideas?\n\nYou need to name the local branch, not the remote one:\n\n$ git push origin mybranch\n\nIt should then push to remotebranch.\n\nHTH,\nAndreas\n"},{"id":"87876","messageId":"32541b130808201401l2ad105ccnc37acdacd08d4c3a@mail.gmail.com","threadId":"15114","inReplyTo":"8585F10E-C33C-481E-B044-A7125F3316F2@web.de","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2008-08-20T21:01:56Z","receivedAt":"2008-08-20T21:01:56Z","isPatch":false,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On Wed, Aug 20, 2008 at 4:40 PM, Andreas Färber wrote:\n> You need to name the local branch, not the remote one:\n>\n> $ git push origin mybranch\n>\n> It should then push to remotebranch.\n\nNot only that, but the \"ahead of tracked branch\" message depends on\nyour local copy of the remote branch, not the remote copy of the\nremote branch. So after pushing, you have to do:\n\n git fetch origin\n\nI've often wondered if we can't just have push refetch the updated\nremote ref automatically. It's extremely hard to explain to newbies\nthat after a push, the order of refs from newest to oldest is 'origin\nmaster', 'master', and 'origin/master'.\n\nHave fun,\n\nAvery\n"},{"id":"87880","messageId":"7vbpznpeup.fsf@gitster.siamese.dyndns.org","threadId":"15114","inReplyTo":"32541b130808201401l2ad105ccnc37acdacd08d4c3a@mail.gmail.com","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-20T21:15:58Z","receivedAt":"2008-08-20T21:15:58Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Avery Pennarun\" writes:\n\n> On Wed, Aug 20, 2008 at 4:40 PM, Andreas Färber wrote:\n>> You need to name the local branch, not the remote one:\n>>\n>> $ git push origin mybranch\n>>\n>> It should then push to remotebranch.\n>\n> Not only that, but the \"ahead of tracked branch\" message depends on\n> your local copy of the remote branch, not the remote copy of the\n> remote branch.\n\nI think we have long been doing so. Daniel, correct me.\n"},{"id":"87882","messageId":"32541b130808201422l2b128beer142544ff91de5ca3@mail.gmail.com","threadId":"15114","inReplyTo":"7vbpznpeup.fsf@gitster.siamese.dyndns.org","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2008-08-20T21:22:05Z","receivedAt":"2008-08-20T21:22:05Z","isPatch":false,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On Wed, Aug 20, 2008 at 5:15 PM, Junio C Hamano wrote:\n> \"Avery Pennarun\" writes:\n>\n>> On Wed, Aug 20, 2008 at 4:40 PM, Andreas Färber wrote:\n>>> You need to name the local branch, not the remote one:\n>>>\n>>> $ git push origin mybranch\n>>>\n>>> It should then push to remotebranch.\n>>\n>> Not only that, but the \"ahead of tracked branch\" message depends on\n>> your local copy of the remote branch, not the remote copy of the\n>> remote branch.\n>\n> I think we have long been doing so. Daniel, correct me.\n\n...and I'm dumb.\n\nI apologize. \"git pull origin mybranch\" does not update\norigin/mybranch. \"git push origin mybranch\" does.\n\nIt could be argued that pull should update the local reference too,\nbut that's irrelevant at the moment.\n\nHave fun,\n\nAvery\n"},{"id":"87897","messageId":"alpine.LNX.1.00.0808201808400.19665@iabervon.org","threadId":"15114","inReplyTo":"32541b130808201422l2b128beer142544ff91de5ca3@mail.gmail.com","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-08-20T22:25:03Z","receivedAt":"2008-08-20T22:25:03Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Wed, 20 Aug 2008, Avery Pennarun wrote:\n\n> On Wed, Aug 20, 2008 at 5:15 PM, Junio C Hamano wrote:\n> > \"Avery Pennarun\" writes:\n> >\n> >> On Wed, Aug 20, 2008 at 4:40 PM, Andreas Färber wrote:\n> >>> You need to name the local branch, not the remote one:\n> >>>\n> >>> $ git push origin mybranch\n> >>>\n> >>> It should then push to remotebranch.\n> >>\n> >> Not only that, but the \"ahead of tracked branch\" message depends on\n> >> your local copy of the remote branch, not the remote copy of the\n> >> remote branch.\n> >\n> > I think we have long been doing so. Daniel, correct me.\n> \n> ...and I'm dumb.\n> \n> I apologize. \"git pull origin mybranch\" does not update\n> origin/mybranch. \"git push origin mybranch\" does.\n> \n> It could be argued that pull should update the local reference too,\n> but that's irrelevant at the moment.\n\nThat is actually to say that fetch should do it (pull calls fetch for that \npart), and I agree with that, assuming you've actually got that fetch \nconfig, of course.\n\n\t-Daniel\n*This .sig left intentionally blank*"},{"id":"87902","messageId":"7v4p5fnw3i.fsf@gitster.siamese.dyndns.org","threadId":"15114","inReplyTo":"alpine.LNX.1.00.0808201808400.19665@iabervon.org","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-20T22:46:25Z","receivedAt":"2008-08-20T22:46:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Daniel Barkalow writes:\n\n> That is actually to say that fetch should do it (pull calls fetch for that \n> part), and I agree with that, assuming you've actually got that fetch \n> config, of course.\n\nHmm, traditionally, an explicit refspec on the command line that does not\nstore overrides the configured ones that do store, and I've been using it\nas a feature when I run test fetches. If I do not like fetched result, I\ncan tell the other guy to fix his history and I do not have to contaminate\nthe history my tracking ref points at. IOW, I use my tracking refs not\njust \"this is where the guy is\", but \"this is the last good one I fetched\nfrom that guy\".\n\nI could be persuaded to use reflog (e.g. \"git diff his@{1}..his\") and\nmanual tagging (i.e. \"git tag -f last-good-his his\") myself, but this is\n\"I'd _tolerate_ such a change myself\", certainly not \"I am happy with that\nchange and I'd help you guys advocate it and try convincing others who\nshared my expectations to switch to reglog and manual tagging.\"\n"},{"id":"87998","messageId":"1219332938839-740444.post@n2.nabble.com","threadId":"15114","inReplyTo":"7v4p5fnw3i.fsf@gitster.siamese.dyndns.org","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"ir0s","fromEmail":"imirene@gmail.com","sentAt":"2008-08-21T15:35:38Z","receivedAt":"2008-08-21T15:35:38Z","isPatch":false,"sender":{"key":"imirene@gmail.com","avatar":"https://gravatar.com/avatar/e9fb5f68e8909109c399883040a4ee1cc9e64149ce86d05d824669bdfd87a3ac?d=mp&s=160"},"body":"\nSorry if you get this twice, oddly my first attempt to send this bounced.\nThank you for all the good advice however, none of it seemed to resolve my\nissue.\n\nAttempting to call:\n$git push origin mybranch\n\nResults in the same message: Everything up to date =/\nI also tried to call $git fetch origin just in case, and doing a pull\ndoesn't return anything (which makes sense, no one pushed anything to the\nbranch -- although I seem to be the only one with this issue.)\n\nCould my branch have somehow diverged from the origin remotebranch?\n\n-- Irene\n\n\nJunio C Hamano wrote:\n> \n> Daniel Barkalow writes:\n> \n>> That is actually to say that fetch should do it (pull calls fetch for\n>> that \n>> part), and I agree with that, assuming you've actually got that fetch \n>> config, of course.\n> \n> Hmm, traditionally, an explicit refspec on the command line that does not\n> store overrides the configured ones that do store, and I've been using it\n> as a feature when I run test fetches. If I do not like fetched result, I\n> can tell the other guy to fix his history and I do not have to contaminate\n> the history my tracking ref points at. IOW, I use my tracking refs not\n> just \"this is where the guy is\", but \"this is the last good one I fetched\n> from that guy\".\n> \n> I could be persuaded to use reflog (e.g. \"git diff his@{1}..his\") and\n> manual tagging (i.e. \"git tag -f last-good-his his\") myself, but this is\n> \"I'd _tolerate_ such a change myself\", certainly not \"I am happy with that\n> change and I'd help you guys advocate it and try convincing others who\n> shared my expectations to switch to reglog and manual tagging.\"\n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n> \n> \n\n-- \nView this message in context: http://n2.nabble.com/Local-branch-ahead-of-tracked-remote-branch-but-git-push-claims-everything-up-to-date-tp736663p740444.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"88002","messageId":"g8k4or$tf$1@ger.gmane.org","threadId":"15114","inReplyTo":"1219332938839-740444.post@n2.nabble.com","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Michael J Gruber","fromEmail":"michaeljgruber+gmane@fastmail.fm","sentAt":"2008-08-21T16:22:49Z","receivedAt":"2008-08-21T16:22:49Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"ir0s venit, vidit, dixit 21.08.2008 17:35:\n> Sorry if you get this twice, oddly my first attempt to send this bounced.\n> Thank you for all the good advice however, none of it seemed to resolve my\n> issue.\n> \n> Attempting to call:\n> $git push origin mybranch\n> \n> Results in the same message: Everything up to date =/\n> I also tried to call $git fetch origin just in case, and doing a pull\n> doesn't return anything (which makes sense, no one pushed anything to the\n> branch -- although I seem to be the only one with this issue.)\n> \n> Could my branch have somehow diverged from the origin remotebranch?\n> \n> -- Irene\n\nWhat do the following report:\n\ngit ls-remote origin\ngit ls-remote .\ngit log --pretty=oneline mybranch...origin/remotebranch\n\nMichael\n"},{"id":"88007","messageId":"1219337620037-740662.post@n2.nabble.com","threadId":"15114","inReplyTo":"g8k4or$tf$1@ger.gmane.org","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"ir0s","fromEmail":"imirene@gmail.com","sentAt":"2008-08-21T16:53:40Z","receivedAt":"2008-08-21T16:53:40Z","isPatch":false,"sender":{"key":"imirene@gmail.com","avatar":"https://gravatar.com/avatar/e9fb5f68e8909109c399883040a4ee1cc9e64149ce86d05d824669bdfd87a3ac?d=mp&s=160"},"body":"\nHi Michael,\n\nHere are my results:\n\n$ git ls-remote origin \n138ea08f9680a8def085b793c9cee70eed0e1f3b HEAD\n138ea08f9680a8def085b793c9cee70eed0e1f3b refs/heads/master\n75290a081feebcc4265825d017d9af07c7646951 refs/heads/remotebranch\nf11c723119cd9938e91e1ed5328ef143fb477f15 refs/heads/mybranch\nf11c723119cd9938e91e1ed5328ef143fb477f15 refs/heads/groups\n...\nThere are a few more\n\nIs it the case that mybranch somehow became a remote branch?\n\nHere are the results for this one:\n$ git log --pretty=oneline mybranch...origin/remotebranch\nf11c723119cd9938e91e1ed5328ef143fb477f15 Merge branch 'remotebranch' of\ngitosis@sorry.must.obfuscate.url.com:my-repo into mybranch\neb41bd8f4f43d483b4a58bc98386c468bb69173c Ticket #1032 \n5e76a7c9bce92519b308c031357794904bf0f4a6 Ticket #1038 \ncu5ceaf670c83f77c1b48e8d31a23456b744f1af0f Ticket #1044\n\nThank you!\n-Irene\n\n\nMichael J Gruber wrote:\n> \n> ir0s venit, vidit, dixit 21.08.2008 17:35:\n>> Sorry if you get this twice, oddly my first attempt to send this bounced.\n>> Thank you for all the good advice however, none of it seemed to resolve\n>> my\n>> issue.\n>> \n>> Attempting to call:\n>> $git push origin mybranch\n>> \n>> Results in the same message: Everything up to date =/\n>> I also tried to call $git fetch origin just in case, and doing a pull\n>> doesn't return anything (which makes sense, no one pushed anything to the\n>> branch -- although I seem to be the only one with this issue.)\n>> \n>> Could my branch have somehow diverged from the origin remotebranch?\n>> \n>> -- Irene\n> \n> What do the following report:\n> \n> git ls-remote origin\n> git ls-remote .\n> git log --pretty=oneline mybranch...origin/remotebranch\n> \n> Michael\n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n> \n> \n\n-- \nView this message in context: http://n2.nabble.com/Local-branch-ahead-of-tracked-remote-branch-but-git-push-claims-everything-up-to-date-tp736663p740662.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"88008","messageId":"1219337739561-740670.post@n2.nabble.com","threadId":"15114","inReplyTo":"g8k4or$tf$1@ger.gmane.org","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"ir0s","fromEmail":"imirene@gmail.com","sentAt":"2008-08-21T16:55:39Z","receivedAt":"2008-08-21T16:55:39Z","isPatch":false,"sender":{"key":"imirene@gmail.com","avatar":"https://gravatar.com/avatar/e9fb5f68e8909109c399883040a4ee1cc9e64149ce86d05d824669bdfd87a3ac?d=mp&s=160"},"body":"\nSorry, and one more:\n$ git ls-remote .\nf11c723119cd9938e91e1ed5328ef143fb477f15 HEAD\n138ea08f9680a8def085b793c9cee70eed0e1f3b refs/heads/master\n75290a081feebcc4265825d017d9af07c7646951 refs/heads/remotebranch\nf11c723119cd9938e91e1ed5328ef143fb477f15 refs/heads/mybranch\n138ea08f9680a8def085b793c9cee70eed0e1f3b refs/remotes/origin/HEAD\n138ea08f9680a8def085b793c9cee70eed0e1f3b refs/remotes/origin/master\n75290a081feebcc4265825d017d9af07c7646951 \nrefs/remotes/origin/remotebranch\nf11c723119cd9938e91e1ed5328ef143fb477f15 \nrefs/remotes/origin/mybranch\n\nThank you!!\n-Irene\n\n\nMichael J Gruber wrote:\n> \n> ir0s venit, vidit, dixit 21.08.2008 17:35:\n>> Sorry if you get this twice, oddly my first attempt to send this bounced.\n>> Thank you for all the good advice however, none of it seemed to resolve\n>> my\n>> issue.\n>> \n>> Attempting to call:\n>> $git push origin mybranch\n>> \n>> Results in the same message: Everything up to date =/\n>> I also tried to call $git fetch origin just in case, and doing a pull\n>> doesn't return anything (which makes sense, no one pushed anything to the\n>> branch -- although I seem to be the only one with this issue.)\n>> \n>> Could my branch have somehow diverged from the origin remotebranch?\n>> \n>> -- Irene\n> \n> What do the following report:\n> \n> git ls-remote origin\n> git ls-remote .\n> git log --pretty=oneline mybranch...origin/remotebranch\n> \n> Michael\n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n> \n> \n\n-- \nView this message in context: http://n2.nabble.com/Local-branch-ahead-of-tracked-remote-branch-but-git-push-claims-everything-up-to-date-tp736663p740670.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"88134","messageId":"g8mhag$i90$1@ger.gmane.org","threadId":"15114","inReplyTo":"1219337620037-740662.post@n2.nabble.com","subject":"Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date","fromName":"Michael J Gruber","fromEmail":"michaeljgruber+gmane@fastmail.fm","sentAt":"2008-08-22T14:09:19Z","receivedAt":"2008-08-22T14:09:19Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"ir0s venit, vidit, dixit 21.08.2008 18:53:\n> Hi Michael,\n> \n> Here are my results:\n> \n> $ git ls-remote origin \n> 138ea08f9680a8def085b793c9cee70eed0e1f3b HEAD\n> 138ea08f9680a8def085b793c9cee70eed0e1f3b refs/heads/master\n> 75290a081feebcc4265825d017d9af07c7646951 refs/heads/remotebranch\n> f11c723119cd9938e91e1ed5328ef143fb477f15 refs/heads/mybranch\n> f11c723119cd9938e91e1ed5328ef143fb477f15 refs/heads/groups\n> ...\n> There are a few more\n> \n> Is it the case that mybranch somehow became a remote branch?\n\nIt means that the repo \"origin\" has a branch called mybranch. From the\nsha1 and the one in your other mail (git ls-remote .) we see that it is\nidentical with your local branch mybranch. It is most certainly the\nresult of a command\n\ngit push origin mybranch\n\nwhich (in the absence of any relevant lines in .git/config) just\nsays that you push that branch into origin with the same name, creating\na branch there if there's none. You can get rid of it using \"git push\norigin :mybranch\".\n\nWhat you most probably wanted to do was\n\ngit push origin mybranch:remotebranch\n\nwhich pushes your mybranch into the remotebranch of the origin repo.\n(You can put this in the config for later pushes, git config\nremote.origin.push mybranch:remotebranch).\n\nOn the other hand:\n\ngit push origin\n\nonly compares existing branches with matching names, which is why it\nreported \"up to date\".\n\nOn yet another hand (I'm losing count):\nWhen you switch to a tracking branch it is compared to its\ncorresponding remote, and your mybranch and origin/remotebranch clearly\ndiffer:\n\n> Here are the results for this one: $ git log --pretty=oneline\n> mybranch...origin/remotebranch \n> f11c723119cd9938e91e1ed5328ef143fb477f15 Merge branch 'remotebranch'\n> of gitosis@sorry.must.obfuscate.url.com:my-repo into mybranch \n> eb41bd8f4f43d483b4a58bc98386c468bb69173c Ticket #1032 \n> 5e76a7c9bce92519b308c031357794904bf0f4a6 Ticket #1038 \n> cu5ceaf670c83f77c1b48e8d31a23456b744f1af0f Ticket #1044\n\nNow, this\n\n> f11c723119cd9938e91e1ed5328ef143fb477f15 HEAD\n> 138ea08f9680a8def085b793c9cee70eed0e1f3b refs/heads/master\n> 75290a081feebcc4265825d017d9af07c7646951 refs/heads/remotebranch\n> f11c723119cd9938e91e1ed5328ef143fb477f15 refs/heads/mybranch\n> 138ea08f9680a8def085b793c9cee70eed0e1f3b refs/remotes/origin/HEAD\n> 138ea08f9680a8def085b793c9cee70eed0e1f3b refs/remotes/origin/master\n> 75290a081feebcc4265825d017d9af07c7646951 \n> refs/remotes/origin/remotebranch\n> f11c723119cd9938e91e1ed5328ef143fb477f15 \n> refs/remotes/origin/mybranch\n\nfrom your other e-mail shows quite a zoo of branches you have locally\nnow. Two of them should probably not be there:\n\nrefs/remotes/origin/mybranch is the result of fetching/pulling from\norigin after creating mybranch there by mistake.\n\nrefs/heads/remotebranch is a local branch named remotebranch. I don't\nknow where it came from, but git revlog may tell you more.\n\nAs a word of comfort: I'm quite new to git and find things confusing\nsometimes, myself. But in the end I always found out that thinhs are the\nway they are for a good reason.\n\nYou're thinking of \"two places\" to exchange information for a branch,\nwhich is natural and confused me first, too. But realise that for a sane\nworkflow you need three:\n- remotebranch at the other repo origin,\n- your remotes/origin/remotebranch which pulls from origin's repo, and -\nyour local tracking branch mybranch which pulls or rebases from\nremotes/origin/remotebranch at the time of your chosing.\n\nYou push from mybranch into the remotebranch of the origin repo.\nThat last one is the one that pushed you off ;) Seriously, that last leg\nof the workflow triangle is not setup automatically (because you may not\nhave push access).\n\nCheers,\nMichael\n"}]}