From 2a9c1fc0ce7fa17c9f42008b4ff93fd45b891d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20=E2=80=9CKwpolska=E2=80=9D=20Warrick?= Date: Thu, 17 Apr 2014 13:29:31 +0200 Subject: [PATCH 1/5] Issues can also be closed by resolve(|s|d) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As documented in https://help.github.com/articles/closing-issues-via-commit-messages (to which the section links on the end!). resolve* was not there from the very beginning, though — and thus many people (get off my lawn!) don’t know about it. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f039c6b..a8f2e00 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ https://github.com/rails/rails/blob/master/activemodel/lib/active_model.rb#L53-L ![Line Highlighting](http://i.imgur.com/8AhjrCz.png) ### Closing Issues via Commit Messages -If a particular commit fixes an issue, any of the keywords `fix/fixes/fixed` or `close/closes/closed`, followed by the issue number, will close the issue once it is committed to the master branch. +If a particular commit fixes an issue, any of the keywords `fix/fixes/fixed`, `close/closes/closed` or `resolve/resolves/resolved`, followed by the issue number, will close the issue once it is committed to the master branch. ```bash $ git commit -m "Fix cock up, fixes #12" From 8642db715362bf1a13b1f8464d34b829cc1eccfe Mon Sep 17 00:00:00 2001 From: Rafal Chmiel Date: Thu, 17 Apr 2014 16:11:29 +0100 Subject: [PATCH 2/5] Note which MRI versions Friction supports (due to rafalchmiel/friction#11) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a8f2e00..65f8d5f 100644 --- a/README.md +++ b/README.md @@ -416,6 +416,8 @@ If you want people to use and contribute to your project, you need to start by a [![Friction output](http://i.imgur.com/4EgpWo4.png)](https://github.com/rafalchmiel/friction) +*Friction supports MRI 2.1.0, MRI 2.0.0, and MRI 1.9.3.* + ### Contributing Guidelines Adding a `CONTRIBUTING` file to the root of your repository will add a link to your file when a contributor creates an Issue or opens a Pull Request. From 43ea5847c181d0ceae194ee19da4b017cfdc1f6e Mon Sep 17 00:00:00 2001 From: RasPat1 Date: Thu, 17 Apr 2014 14:57:44 -0400 Subject: [PATCH 3/5] A more elaborate git log Beautiful git log that looks just like gitk. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65f8d5f..20f67b8 100644 --- a/README.md +++ b/README.md @@ -558,12 +558,14 @@ This is produced: Running: ```bash -$ git log --all --graph --decorate --oneline --abbrev-commit +$ git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\n--abbrev-commit --date=relative ``` Produces: -![git log --all --graph --decorate --oneline --abbrev-commit](http://i.imgur.com/RUPycwI.png) +![git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\n--abbrev-commit --date=relative](http://imgur.com/ZcMZiD3) + +Add this as an alias to your global git config. Credit to [Palesz](http://stackoverflow.com/users/88355/palesz) *This can be aliased using the instructions found [here](https://github.com/tiimgreen/github-cheat-sheet#aliases).* From 3c20d96ec7b0040b2be1a5229db495fefc56957d Mon Sep 17 00:00:00 2001 From: RasPat1 Date: Thu, 17 Apr 2014 17:01:40 -0400 Subject: [PATCH 4/5] Remove \n Update image Random \n and image replaced with consistent terminal output --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 20f67b8..31dc98e 100644 --- a/README.md +++ b/README.md @@ -563,7 +563,7 @@ $ git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s Produces: -![git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\n--abbrev-commit --date=relative](http://imgur.com/ZcMZiD3) +![git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative](http://i.imgur.com/R2z8l7c.png) Add this as an alias to your global git config. Credit to [Palesz](http://stackoverflow.com/users/88355/palesz) From 69da2b5c44de7ea27a15edbd4137536d3f3d4a0b Mon Sep 17 00:00:00 2001 From: Tim Green Date: Thu, 17 Apr 2014 22:10:59 +0100 Subject: [PATCH 5/5] Remove newline literal and duplicated info --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31dc98e..5b9eb10 100644 --- a/README.md +++ b/README.md @@ -558,14 +558,14 @@ This is produced: Running: ```bash -$ git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\n--abbrev-commit --date=relative +$ git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative ``` Produces: ![git log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative](http://i.imgur.com/R2z8l7c.png) -Add this as an alias to your global git config. Credit to [Palesz](http://stackoverflow.com/users/88355/palesz) +Credit to [Palesz](http://stackoverflow.com/users/88355/palesz) *This can be aliased using the instructions found [here](https://github.com/tiimgreen/github-cheat-sheet#aliases).*