And what is the output of this: $ git status
...... and the first 20 lines or so of this: $ log --graph --oneline --all --color --decorate On Mar 29, 2012, at 5:05 PM, Johnny Miller wrote: > Hi Kieran, > > See output from commands below. > > Question: And which local branch are you trying to push to which branch in > your own fork? > > My fork is https://github.com/johnnykahalawai/wonder > > I would like to be able to make commits to my fork and then make the pull > requests to Wonder's integration branch. > > Thank you, > > Johnny > > > mala:wonder johnnymiller$ git branch -avv > * master 7ad6e3e > [origin/integration] Added a default CSS style for MTAjaxModalContainer. And > I updated the bindings in the example application to reflect that. > remotes/origin/HEAD -> origin/master > remotes/origin/Wonder_5_0_0_Legacy 12f0d82 Added > instructions to the README in ERJasperReports that explains how to deploy > your report fonts inside your project. > remotes/origin/Wonder_5_0_0_WebObjects_5_3_Branch d4a5828 svn merge -c > 11990 > https://wonder.svn.sourceforge.net/svnroot/wonder/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder > . > remotes/origin/Wonder_5_0_0_WebObjects_5_4_3_1_Branch 895d1b4 5.4.3.1 -- > roll back eoattribute patch > remotes/origin/Wonder_5_0_0_WebObjects_5_4_Branch 3bd1499 Property > name components should not use the same RHSKey to escapeHTML as property > value components. Changing the value to false as I can't think of any reason > why escaping html on the property name would be required. > remotes/origin/Wonder_5_0_0_WebObjects_5_5_Branch 7294379 trunk=>5.5 > merge > remotes/origin/Wonder_5_0_0_WebObjects_5_6_Branch d8e363b 5.6 > compatibility > remotes/origin/gh-pages 77be675 First commit > to gh-pages > remotes/origin/master 7ad6e3e Added a > default CSS style for MTAjaxModalContainer. And I updated the bindings in > the example application to reflect that. > remotes/upstream/Wonder_5_0_0_Legacy 12f0d82 Added > instructions to the README in ERJasperReports that explains how to deploy > your report fonts inside your project. > remotes/upstream/Wonder_5_0_0_WebObjects_5_3_Branch d4a5828 svn merge -c > 11990 > https://wonder.svn.sourceforge.net/svnroot/wonder/branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder > . > remotes/upstream/Wonder_5_0_0_WebObjects_5_4_3_1_Branch 895d1b4 5.4.3.1 -- > roll back eoattribute patch > remotes/upstream/Wonder_5_0_0_WebObjects_5_4_Branch 3bd1499 Property > name components should not use the same RHSKey to escapeHTML as property > value components. Changing the value to false as I can't think of any reason > why escaping html on the property name would be required. > remotes/upstream/Wonder_5_0_0_WebObjects_5_5_Branch 7294379 trunk=>5.5 > merge > remotes/upstream/Wonder_5_0_0_WebObjects_5_6_Branch d8e363b 5.6 > compatibility > remotes/upstream/gh-pages 77be675 First commit > to gh-pages > remotes/upstream/integration ad60ddb those files > slipped through, remove them for now > remotes/upstream/master 395ef59 resurrect > root directory Eclipse files for those who want to import the whole Wonder > dir into Eclipse > > origin https://github.com/johnnykahalawai/wonder (fetch) > origin https://github.com/johnnykahalawai/wonder (push) > upstream https://github.com/projectwonder/wonder (fetch) > upstream https://github.com/projectwonder/wonder (push) > > > Johnny Miller > Kahalawai Media Corp. > www.kahalawai.com > > > > On Mar 29, 2012, at 10:57 AM, Kieran Kelleher wrote: > >> git branch -avv > _______________________________________________ Do not post admin requests to the list. They will be ignored. Webobjects-dev mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/webobjects-dev/archive%40mail-archive.com This email sent to [email protected]
