Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!--- What types of changes does your submission introduce? Put an `x` in all the boxes that apply: -->

- [ ] 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:

Expand All @@ -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.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.
2 changes: 1 addition & 1 deletion git-extra-commands.plugin.zsh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2006-2016 Joseph Block <jpb@apesseekingknowledge.net>
# Copyright 2006-2018 Joseph Block <jpb@apesseekingknowledge.net>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down