diff --git a/README.md b/README.md index ad555ce1c6..09fdb3770a 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,23 @@ -# Git-it (Desktop App) +# Git-it (Desktop App) - adapted for Command Shift -[](https://travis-ci.org/jlord/git-it-electron) [](http://standardjs.com/) - - -Git-it is a desktop (Mac, Windows and Linux) app that teaches you how to use Git and GitHub on the [command line](https://en.wikipedia.org/wiki/Command-line_interface). - -Previously it ran _in_ terminal (the command line application) with a guide online but now the guide _is_ the app and it runs on your desktop on its own :sparkles: **This will be the only maintained version going forward** :arrow_right: + +Git-it is a desktop (Mac, Windows and Linux) app that teaches you how to use Git and GitHub on the [command line](https://en.wikipedia.org/wiki/Command-line_interface). Please work through all of the steps, ensuring you verify your solutions along the way. --- + ## Hello future Forkers, Branchers and Pull Requesters! This application contains challenges for learning Git and GitHub—by using _real_ Git and GitHub, not emulators. You'll be learning the awesome (and not so scary) command line and GitHub which means when you finish all of the challenges you'll have _real_ repositories on your GitHub account and green squares on your [contribution chart](https://github.com/blog/1360-introducing-contributions).  -## What to Install - -You will need this app, Git-it as well as a text editor. You'll also of course need Git and the first challenge in Git-it helps you get that set up. But if you want to get a head start, go for it! You'll continue to use Git and your text editor throughout your bright social coding future. - -As a part of the challenges you'll also create a (free) account on GitHub. If you've already got one, high-five! +## Applications -#### Git +You will need to use and install this app Git-it, as well as Visual Studio Code to edit the files. You'll also of course need Git (you should have Visual Studio Code and Git installed already). -We recommend installing [GitHub Desktop](http://desktop.github.com) (free) because it installs Git in the most consistent way across supported operating systems (Windows and Mac). We won't use the app itself in the challenges (but it is really useful once you get going in Git!), just the Git that it install for you. +### Git-it -Note—If you're using Windows, you should use the **Git Shell** app as your terminal—it is installed with GitHub Desktop. In Mac and Linux you can use the app **Terminal**, which is already on your computer. - -#### Text Editor - -I'm quite partial (I'm on the team!) but [Atom](http://atom.io) is a great text editor (also free) and it is built on [Electron.js](http://electron.atom.io), just like Git-it. Visit the website and download the version for your operating system. [Sublime](https://www.sublimetext.com), [Microsoft VS Code](https://code.visualstudio.com) and [Adobe Brackets](http://brackets.io) are other options. - -#### Git-it - -You can view the [releases](http://github.com/jlord/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux: +You can view the [releases](https://github.com/MCRcodes/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux:  @@ -42,13 +27,11 @@ You can view the [releases](http://github.com/jlord/git-it-electron/releases) se ## Get Started! -Open Git-it and click the button to begin the first challenge. Have your terminal and text editor open, too. Follow along with the instructions in each challenge and use the terminal or editor as instructed. +Open Git-it and click the button to begin the first challenge. Have your terminal and Visual Studio Code open too. Follow along with the instructions in each challenge and use the terminal or editor as instructed. When you've completed the steps in a challenge click 'Verify'. Depending on the challenge you may need to also select the folder you did your work in for Git-it to verify. -**Questions?** [Open an issue](http://github.com/jlord/git-it-electron/issues/new) on this repository. - -**Want to contribute or build locally?** See the [contributing documentation](CONTRIBUTING.md) +**Questions?** Post them in your cohort slack channel! --- diff --git a/resources/contents/en-US/pages/index.html b/resources/contents/en-US/pages/index.html index 593829b059..99041df915 100644 --- a/resources/contents/en-US/pages/index.html +++ b/resources/contents/en-US/pages/index.html @@ -45,7 +45,7 @@
This application has been adapted for Manchester Codes. Credit goes to Jessica Lord for the original application.
+This application has been adapted for Command Shift. Credit goes to Jessica Lord for the original application.