You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+9-7Lines changed: 9 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@
8
8
9
9
A zsh plugin that packages some extra git helper scripts I've found. I only wrote a few of these scripts, and the ones I didn't each have whatever licensing is included in the file.
10
10
11
-
This collection doesn't actually require zsh, but packaging it as a ZSH plugin makes it more convenient for people using a ZSH framework to use this collection.
11
+
This collection doesn't actually require ZSH, but packaging it as a ZSH plugin makes it more convenient for people using a ZSH framework to use this collection.
12
12
13
13
If you wrote one of these scripts and want it removed from this collection, please either make a PR and/or file an issue against the repo and I will remove it.
14
14
@@ -35,14 +35,14 @@ If you wrote one of these scripts and want it removed from this collection, plea
35
35
36
36
### Pre-requisites
37
37
38
-
A relatively recent version of git. The version of git Apple includes in macOS is stale. `brew install git` if you're on macOS.
38
+
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.
39
39
40
40
### Antigen
41
41
42
42
If you're using [Antigen](https://github.com/zsh-users/antigen):
43
43
44
44
1. Add `antigen bundle unixorn/git-extra-commands` to your `.zshrc` where you've listed your other plugins.
45
-
2. Close and reopen your Terminal/iTerm window to **refresh context** and use the plugin. Alternatively, you can run `antigen bundle unixorn/git-extra-commands` in a running shell to have antigen load the new plugin.
45
+
2. Close and reopen your Terminal/iTerm window to **refresh context** and use the plugin. Alternatively, you can run `antigen bundle unixorn/git-extra-commands` in a running shell to have `antigen` load the new plugin.
46
46
47
47
### oh-my-zsh
48
48
@@ -75,7 +75,7 @@ If you're using [zgen](https://github.com/tarjoilija/zgen):
75
75
76
76
Nothing here actually requires you to use ZSH or zgen, that's just a convenient distribution method for anyone using a ZSH framework.
77
77
78
-
If you aren't using any zsh frameworks, or if you're a bash user, do the following steps:
78
+
If you aren't using any ZSH frameworks, or if you're a `bash` user, do the following steps:
79
79
80
80
1. git clone this repository
81
81
2. Add `cloneDirectory/bin` to your `$PATH`.
@@ -183,7 +183,7 @@ Here are some helpful aliases for your `~/.gitconfig`
183
183
184
184
* Scott Chacon's [Pro Git](http://git-scm.com/book) book is a great resource for getting more out of git.
185
185
186
-
* Zach Dennis has a great [blog post](http://www.mutuallyhuman.com/blog/2012/06/22/a-git-walkthrough/) - it's worth reading on it's own, but here are a couple of good sites I found through it:
186
+
* Zach Dennis has a great blog post - [A Git Walkthrough](http://www.mutuallyhuman.com/blog/2012/06/22/a-git-walkthrough/) - it's worth reading on it's own, but here are a couple of good sites I found through it:
187
187
*[gitready.com/](http://gitready.com/) is another great reference which has been collecting information and tips for git since 2009.
188
188
*[gitimmersion.com/](http://gitimmersion.com/)
189
189
@@ -195,7 +195,7 @@ Here are some helpful aliases for your `~/.gitconfig`
195
195
196
196
*[git-tips/tips](https://github.com/git-tips/tips) is a collection of git tips
197
197
198
-
* Christian Neukirchen wrote a great [blog post](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.
198
+
* 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.
199
199
200
200
* Mislav Marohnić has a good article on git tips on his [blog](http://mislav.net/2010/07/git-tips/). Several of his git scripts are in this collection.
201
201
@@ -213,6 +213,8 @@ Here are some helpful aliases for your `~/.gitconfig`
213
213
214
214
*[How to Review a Merge Commit](https://haacked.com/archive/2014/02/21/reviewing-merge-commits/) - Good article on dealing with reviewing the changes made during a merge.
215
215
216
+
*[A Tidy, Linear Git History](http://www.bitsnbites.eu/a-tidy-linear-git-history/) - Marcus Geelnard wrote a blog post about the value of a linear commit history.
217
+
216
218
### External Git Utilities
217
219
218
220
*[bfg repo-cleaner](https://rtyley.github.io/bfg-repo-cleaner/) - Removes large or troublesome blobs like `git filter-branch` does, but faster.
@@ -259,4 +261,4 @@ Here are some helpful aliases for your `~/.gitconfig`
259
261
## Contributing
260
262
261
263
* Please include an entry in the credits section of README.md for any scripts in your PRs so authors get their work credited correctly.
262
-
* 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.
264
+
* 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.
0 commit comments