{"thread":{"id":"3352","subject":"[ANNOUNCE] GIT 1.2.1","startedAt":"2006-02-16T06:25:59Z","lastAt":"2006-02-18T10:39:41Z","messageCount":3,"participants":["Junio C Hamano","Michael Fischer","Andreas Ericsson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16246","messageId":"7vzmkrizuw.fsf@assigned-by-dhcp.cox.net","threadId":"3352","inReplyTo":null,"subject":"[ANNOUNCE] GIT 1.2.1","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-16T06:25:59Z","receivedAt":"2006-02-16T06:25:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The latest maintenance release GIT 1.2.1 is available at the\nusual places:\n\n\thttp://www.kernel.org/pub/software/scm/git/\n\n\tgit-1.2.1.tar.{gz,bz2}\t\t\t(tarball)\n\tRPMS/$arch/git-*-1.2.1-1.$arch.rpm\t(RPM)\n\n\nNothing earth-shattering but cleanups and cleanups and cleanups.\n\nAll the interesting things are happening in \"master\" and \"pu\",\nwhich will be a topic for a separate message.\n\n----------------------------------------------------------------\n\nChanges since v1.2.0 are as follows:\n\nFernando J. Pereda:\n      Print an error if cloning a http repo and NO_CURL is set\n\nFredrik Kuivinen:\n      s/SHELL/SHELL_PATH/ in Makefile\n\nJosef Weidendorfer:\n      More useful/hinting error messages in git-checkout\n\nJunio C Hamano:\n      Documentation: git-commit in 1.2.X series defaults to --include.\n      Documentation: git-ls-files asciidocco.\n      bisect: remove BISECT_NAMES after done.\n      combine-diff: diff-files fix.\n      combine-diff: diff-files fix (#2)\n      checkout: fix dirty-file display.\n"},{"id":"16356","messageId":"20060218043113.GA8976@blinkenlights.visv.net","threadId":"3352","inReplyTo":"7vzmkrizuw.fsf@assigned-by-dhcp.cox.net","subject":"Re: [ANNOUNCE] GIT 1.2.1","fromName":"Michael Fischer","fromEmail":"michael@visv.net","sentAt":"2006-02-18T04:31:13Z","receivedAt":"2006-02-18T04:31:13Z","isPatch":false,"sender":{"key":"michael@visv.net","avatar":null},"body":"\n*sigh*\n\nI got confused about git pull origin and git pull master.\n\nTutorial seems to tell me I should have said git pull origin\nand left well enough alone. \n\nNow I get:\n\nfatal: you need to resolve your current index first\n\nHow do I do that?\n\nTIA.\n\n\nMichael\n-- \nMichael Fischer                         Happiness is a config option.\nmichael@visv.net                        Recompile and be happy. \n"},{"id":"16378","messageId":"43F6F96D.9090209@op5.se","threadId":"3352","inReplyTo":"20060218043113.GA8976@blinkenlights.visv.net","subject":"Re: [ANNOUNCE] GIT 1.2.1","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-02-18T10:39:41Z","receivedAt":"2006-02-18T10:39:41Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Michael Fischer wrote:\n> *sigh*\n> \n> I got confused about git pull origin and git pull master.\n> \n> Tutorial seems to tell me I should have said git pull origin\n> and left well enough alone. \n> \n> Now I get:\n> \n> fatal: you need to resolve your current index first\n> \n> How do I do that?\n> \n\nIf you just want to clean the index so you can pull from origin again, \nyou should be able to just do\n\n\t$ git reset --hard origin\n\nIf you've got local changes that has caused conflicts in the index you \nneed to fix that up first and commit them.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"}]}