From 4320dbbcd256baeddc1e3dbdee48a090fbda6601 Mon Sep 17 00:00:00 2001 From: Joe Block Date: Mon, 4 Jun 2018 11:35:08 -0700 Subject: [PATCH 1/3] Update copyright --- git-extra-commands.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-extra-commands.plugin.zsh b/git-extra-commands.plugin.zsh index 1c62e3c48..f39942694 100644 --- a/git-extra-commands.plugin.zsh +++ b/git-extra-commands.plugin.zsh @@ -1,4 +1,4 @@ -# Copyright 2006-2016 Joseph Block +# Copyright 2006-2018 Joseph Block # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From fa07d7328496a0a9667eca0dc6260a4d5e31e294 Mon Sep 17 00:00:00 2001 From: Joe Block Date: Mon, 4 Jun 2018 11:37:12 -0700 Subject: [PATCH 2/3] Readme cleanups * Make warning about the git version being stale on macOS explicitly call out security implications. * Minor formatting and typo cleanups * Ask for credit comment in scripts added --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ff28f1b18..447eb488e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you wrote one of these scripts and want it removed from this collection, plea ### Pre-requisites -A relatively recent version of `git`. The version of `git` Apple includes in macOS is very stale. You should really `brew install git` to get the current version if you're on macOS. +A relatively recent version of `git`. The version of `git` Apple includes in macOS is very stale. You should really `brew install git` to get the current version if you're on macOS - if not for features, for security updates. ### Antigen @@ -80,7 +80,7 @@ Nothing here actually requires you to use ZSH or zgen, that's just a convenient If you aren't using any ZSH frameworks, or if you're a `bash` user, do the following steps: -1. git clone this repository +1. `git clone` this repository 2. Add `cloneDirectory/bin` to your `$PATH`. ## Included Scripts @@ -196,7 +196,7 @@ Here are some helpful aliases for your `~/.gitconfig` * Kate Hudson maintains the [git flight rules](https://github.com/k88hudson/git-flight-rules) collection of useful git usage tips. -* [git-tips/tips](https://github.com/git-tips/tips) is a collection of git tips +* [git-tips/tips](https://github.com/git-tips/tips) is a collection of git tips. * Christian Neukirchen wrote a great blog post, [A Grab Bag of Git Tricks](http://chneukirchen.org/blog/archive/2013/01/a-grab-bag-of-git-tricks.html) on git that is the source for several scripts in this collection. @@ -282,5 +282,5 @@ git config --global url."https://github".insteadOf git://github ## Contributing -* Please include an entry in the credits section of README.md for any scripts in your PRs so authors get their work credited correctly. +* Please include an entry both in the credits section of README.md for any scripts and a credit comment in the script itself in your PRs so authors get their work credited correctly. * Please use `#!/usr/bin/env interpreter` instead of a direct path to the interpreter, this makes it easier for people to use more recent versions when the ones packaged with their OS (macOS and CentOS, I'm looking at you!) are stale. From 090b9969d7d72b43971e82f21faa437ba99521e1 Mon Sep 17 00:00:00 2001 From: Joe Block Date: Mon, 4 Jun 2018 11:40:32 -0700 Subject: [PATCH 3/3] Update PULL_REQUEST_TEMPLATE.md --- PULL_REQUEST_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index d50069a0e..bfb835a97 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,7 @@ - [ ] A helper script -- [ ] A link to an external resource like a blog post +- [ ] A link to an external resource like a blog post or video # Checklist: @@ -20,5 +20,6 @@ - [ ] Any scripts added use `#!/usr/bin/env interpreter` instead of potentially platform-specific direct paths (`#!/bin/sh` is an ok exception)\ - [ ] Scripts are marked executable - [ ] I have added a credit line to README.md for the script +- [ ] If there was no author credit in a script added in this PR, I have added one. - [ ] I have confirmed that the link(s) in my PR are valid. - [ ] I have read the **CONTRIBUTING** document.