From 6bb853d4f89fee2da33ac2be77bbcd7cffee2b88 Mon Sep 17 00:00:00 2001 From: Brian Jesse Date: Wed, 7 Aug 2013 23:25:32 -0500 Subject: [PATCH 1/2] fixed readme formatting --- README.md | 113 +++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index b06091b..e654510 100644 --- a/README.md +++ b/README.md @@ -1,108 +1,107 @@ # Outline 1. Installation -* OSX installation: - - Standard installation + * OSX installation: + - Standard installation - [`http://code.google.com/p/git-osx-installer`](http://code.google.com/p/git-osx-installer) + [`http://code.google.com/p/git-osx-installer`](http://code.google.com/p/git-osx-installer) - - With Macports: + - With Macports: - sudo port install git-core +svn +doc +bash_completion +gitweb + sudo port install git-core +svn +doc +bash_completion +gitweb -* Windows installation: + * Windows installation: - [`http://msysgit.github.com/`](http://msysgit.github.com/) + [`http://msysgit.github.com/`](http://msysgit.github.com/) 2. Setup -* Identity + * Identity - $ git config --global user.name "Brian Jesse" - $ git config --global user.email user@example.com -* Configuration Files - `~/.gitconfig` + $ git config --global user.name "Brian Jesse" + $ git config --global user.email user@example.com + + * Configuration Files + `~/.gitconfig` 3. Cloning -* `git clone http://github.com/bajesse/git-workshop.git` -* `cd git-workshop` + * `git clone http://github.com/bajesse/git-workshop.git` + * `cd git-workshop` 4. Checkout a branch -* `git checkout dev` + * `git checkout dev` 5. Create a feature branch -* `git checkout -b my-feature` + * `git checkout -b my-feature` 6. Modify files 7. Check the status -* `git status` + * `git status` 8. Stage files -* `git add index.html` -* `git add style.css` -* `git status` + * `git add index.html` + * `git add style.css` + * `git status` 9. Commit staged changes -* `git commit -m 'my message` + * `git commit -m 'my message` 10. Check the log -* `git log` + * `git log` 11. Merge into devel -* `git checkout dev` -* `git merge my-feature` - + * `git checkout dev` + * `git merge my-feature` + 12. Demonstration of push 13. Create a release branch -* `git checkout -b release-1` -* Modify branch with bugfixes and commit to release + * `git checkout -b release-1` + * Modify branch with bugfixes and commit to release 14. Merge into master and dev -* `git checkout master` -* `git merge release-1` -* `git push origin master` -* `git checkout dev` -* `git merge release-1` -* `git push origin dev` + * `git checkout master` + * `git merge release-1` + * `git push origin master` + * `git checkout dev` + * `git merge release-1` + * `git push origin dev` 15. Tagging the release -* `git checkout master` -* `git tag 1.0` + * `git checkout master` + * `git tag 1.0` 16. Managing hotfixes -* the same as a release branch, but it is branched from master and merged back to dev and master + * the same as a release branch, but it is branched from master and merged back to dev and master 17. Merge conflict resolution -* Git will create a new commit when merge conflicts occur -* Any files that now have merge conflicts will have resolution markers in them -* Git will also add local, remote, and base versions of the file for you to diff against -* When you are satisfied with the merge run + * Git will create a new commit when merge conflicts occur + * Any files that now have merge conflicts will have resolution markers in them + * Git will also add local, remote, and base versions of the file for you to diff against + * When you are satisfied with the merge run $ git add $ git commit -* The mergetool may come in handy + * The mergetool may come in handy $ git config --global merge.tool vimdiff $ git mergetool 18. Other concepts -* `git help` -* Creating new repositories with `git init` -* Ignoring files with `.gitignore` -* `git stash` and `git stash pop` -* Adding/removing remote repositories + * `git help` + * Creating new repositories with `git init` + * Ignoring files with `.gitignore` + * `git stash` and `git stash pop` + * Adding/removing remote repositories 19. Resources -* Pro Git (Book) - - Free online [`http://git-scm.com/book`](http://git-scm.com/book) -* Try git online - - [`http://try.github.io/levels/1/challenges/1`](http://try.github.io/levels/1/challenges/1) -* Git Immersion - - [`http://gitimmersion.com/lab_01.html`](http://gitimmersion.com/lab_01.html) -* Check out the presentation - - [`http://brian-jesse.com/gittalk`](http://brian-jesse.com/gittalk) - -* Twitter @Brain_Bacon - - [`https://twitter.com/Brain_Bacon`](https://twitter.com/Brain_Bacon) + * Pro Git (Book) + - Free online [`http://git-scm.com/book`](http://git-scm.com/book) + * Try git online + - [`http://try.github.io/levels/1/challenges/1`](http://try.github.io/levels/1/challenges/1) + * Git Immersion + - [`http://gitimmersion.com/lab_01.html`](http://gitimmersion.com/lab_01.html) + * Check out the presentation + - [`http://brian-jesse.com/gittalk`](http://brian-jesse.com/gittalk) + From 09946741cf9b69ec9d585796795f8643dfbbcd49 Mon Sep 17 00:00:00 2001 From: Brian Jesse Date: Wed, 7 Aug 2013 23:29:41 -0500 Subject: [PATCH 2/2] fixed readme formatting --- README.md | 56 ++++++++++++------------------------------------------- 1 file changed, 12 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index e654510..c4e8a5c 100644 --- a/README.md +++ b/README.md @@ -2,63 +2,39 @@ 1. Installation * OSX installation: - - Standard installation - - [`http://code.google.com/p/git-osx-installer`](http://code.google.com/p/git-osx-installer) - - - With Macports: - - sudo port install git-core +svn +doc +bash_completion +gitweb - - * Windows installation: - - [`http://msysgit.github.com/`](http://msysgit.github.com/) - + - Standard installation [`http://code.google.com/p/git-osx-installer`](http://code.google.com/p/git-osx-installer) + - With Macports: `sudo port install git-core +svn +doc +bash_completion +gitweb` + * Windows installation: [`http://msysgit.github.com/`](http://msysgit.github.com/) 2. Setup - * Identity - - $ git config --global user.name "Brian Jesse" - $ git config --global user.email user@example.com - - * Configuration Files - `~/.gitconfig` - + * Identity + - `$ git config --global user.name "Brian Jesse"` + - `$ git config --global user.email user@example.com` + * Configuration Files `~/.gitconfig` 3. Cloning * `git clone http://github.com/bajesse/git-workshop.git` * `cd git-workshop` - 4. Checkout a branch * `git checkout dev` - 5. Create a feature branch * `git checkout -b my-feature` - 6. Modify files - 7. Check the status * `git status` - 8. Stage files * `git add index.html` * `git add style.css` * `git status` - 9. Commit staged changes * `git commit -m 'my message` - 10. Check the log - * `git log` - + * `git log` 11. Merge into devel * `git checkout dev` * `git merge my-feature` - 12. Demonstration of push - 13. Create a release branch * `git checkout -b release-1` * Modify branch with bugfixes and commit to release - 14. Merge into master and dev * `git checkout master` * `git merge release-1` @@ -66,35 +42,27 @@ * `git checkout dev` * `git merge release-1` * `git push origin dev` - 15. Tagging the release * `git checkout master` * `git tag 1.0` - 16. Managing hotfixes * the same as a release branch, but it is branched from master and merged back to dev and master - 17. Merge conflict resolution * Git will create a new commit when merge conflicts occur * Any files that now have merge conflicts will have resolution markers in them * Git will also add local, remote, and base versions of the file for you to diff against * When you are satisfied with the merge run - - $ git add - $ git commit - + - `$ git add ` + - `$ git commit` * The mergetool may come in handy - - $ git config --global merge.tool vimdiff - $ git mergetool - + - `$ git config --global merge.tool vimdiff` + - `$ git mergetool` 18. Other concepts * `git help` * Creating new repositories with `git init` * Ignoring files with `.gitignore` * `git stash` and `git stash pop` * Adding/removing remote repositories - 19. Resources * Pro Git (Book) - Free online [`http://git-scm.com/book`](http://git-scm.com/book)