Hi William, Not sure if you are interested in git GUIs on the Mac, but I have had very good results working with github.com and the QGIS project repository using SourceTree [0]. I have had very few reasons to go to the command line since moving to it (I do commit squashing in Terminal/BBEdit). Currently free, as well.
http://sourcetreeapp.com/ [0] https://dl.dropbox.com/u/4058089/qgis/sourcetree_qgis.png Larry On Sun, Jul 22, 2012 at 5:22 PM, William Kyngesburye <[email protected]> wrote: > Ah, the branch -D option is what I want. I think I may have seen this when > looking at the documentation, but it sounded like it might affect upstream. > > On Jul 22, 2012, at 6:04 PM, Nathan Woodrow wrote: > >> You should normally push with: git push origin master >> >> This will mean only master is pushed, it sounds like you are pushing >> all your branches. I also normally do: git push origin master >> --dry-run to see exactly what is getting pushed upstream. >> >> No need to reclone anything. If you don't need the 1.7 and 1.8 >> branches just delete them from your local copy using: git branch -D >> {1.8 branch name} >> >> - Nathan >> >> On Mon, Jul 23, 2012 at 8:59 AM, William Kyngesburye >> <[email protected]> wrote: >>> I'd like to avoid downloading from scratch. >>> >>> On Jul 22, 2012, at 5:05 PM, Etienne Tourigny wrote: >>> >>>> you might want to try 'git push origin master' to make sure it just >>>> pushes the master branch. >>>> >>>> In any case - maybe fetch a brand new clone to make sure? >>>> >>>> On Sun, Jul 22, 2012 at 7:01 PM, William Kyngesburye >>>> <[email protected]> wrote: >>>>> Twice today I've push a couple commits (last time was before the 1.8 >>>>> release), one <100KB and one <1KB, and both times the push has uploaded >>>>> 11MB. Yet all that appears at github is the changes I made (as I would >>>>> expect). >>>>> >>>>> I wonder if it has something to do with the stale 1.7 and 1.8 branches on >>>>> my computer? Those keep giving me [rejected] notices and the push ends >>>>> with an error: failed to push some refs. I don't think I've made any >>>>> changes to these that haven't been pushed (certainly not the old 1.7 >>>>> branch). >>>>> >>>>> Is there a way to un-checkout branches I'm no longer using? I think I >>>>> reset my 1.7 copy a while back so I didn't get push errors like this, but >>>>> something got out of whack again. >>>>> >>>>> ----- >>>>> William Kyngesburye <kyngchaos*at*kyngchaos*dot*com> >>>>> http://www.kyngchaos.com/ >>>>> >>>>> "I ache, therefore I am. Or in my case - I am, therefore I ache." >>>>> >>>>> - Marvin >>>>> >>>>> >>>>> _______________________________________________ >>>>> Qgis-developer mailing list >>>>> [email protected] >>>>> http://lists.osgeo.org/mailman/listinfo/qgis-developer >>>> _______________________________________________ >>>> Qgis-developer mailing list >>>> [email protected] >>>> http://lists.osgeo.org/mailman/listinfo/qgis-developer >>> >>> ----- >>> William Kyngesburye <kyngchaos*at*kyngchaos*dot*com> >>> http://www.kyngchaos.com/ >>> >>> "This is a question about the past, is it? ... How can I tell that the past >>> isn't a fiction designed to account for the discrepancy between my >>> immediate physical sensations and my state of mind?" >>> >>> - The Ruler of the Universe >>> >>> >>> ----- >>> William Kyngesburye <kyngchaos*at*kyngchaos*dot*com> >>> http://www.kyngchaos.com/ >>> >>> Theory of the Universe >>> >>> There is a theory which states that if ever anyone discovers exactly what >>> the universe is for and why it is here, it will instantly disappear and be >>> replaced by something even more bizarrely inexplicable. There is another >>> theory which states that this has already happened. >>> >>> -Hitchhiker's Guide to the Galaxy 2nd season intro >>> >>> >>> _______________________________________________ >>> Qgis-developer mailing list >>> [email protected] >>> http://lists.osgeo.org/mailman/listinfo/qgis-developer >> _______________________________________________ >> Qgis-developer mailing list >> [email protected] >> http://lists.osgeo.org/mailman/listinfo/qgis-developer > > ----- > William Kyngesburye <kyngchaos*at*kyngchaos*dot*com> > http://www.kyngchaos.com/ > > [Trillian] What are you supposed to do WITH a maniacally depressed robot? > > [Marvin] You think you have problems? What are you supposed to do if you > ARE a maniacally depressed robot? No, don't try and answer, I'm 50,000 times > more intelligent than you and even I don't know the answer... > > - HitchHiker's Guide to the Galaxy > > > _______________________________________________ > Qgis-developer mailing list > [email protected] > http://lists.osgeo.org/mailman/listinfo/qgis-developer _______________________________________________ Qgis-developer mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/qgis-developer
