Skip to content

Commit 4269973

Browse files
committed
Minor wording/formatting changes
* Fix a few unformatted script references * Tag both `git-up` variants with language tags
1 parent f074f62 commit 4269973

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Here are some helpful aliases for your `~/.gitconfig`
171171
| `fetch-pull-requests = fetch origin '+refs/pull/*/head:refs/remotes/origin/pull/*'` | Fetch pull requests from github so you can `git checkout pull/123` and test them locally. |
172172
| `roots = log --all --oneline --decorate --max-parents=0` | Show the root commits. |
173173
| `unpushed = log @{u}..` | Show which commits have not been pushed to the tracking branch and are safe to amend/rebase. |
174-
| `wip = rebase -i @{u}` | Starts an interactive rebase of all the commits you haven't pushed yet. Handy for collapsing a bunch of WIP snapshots into logical commits before pushing, without having to worry about accidentally squashing a commit someone else has already referred to. |
174+
| `work-in-progress = rebase -i @{u}` | Starts an interactive rebase of all the commits you haven't pushed yet. Handy for collapsing a bunch of work-in-progress snapshots into logical commits before pushing, without having to worry about accidentally squashing a commit someone else has already referred to. |
175175

176176
## Other useful git stuff
177177

@@ -213,7 +213,7 @@ Here are some helpful aliases for your `~/.gitconfig`
213213

214214
### External Git Utilities
215215

216-
* [bfg repo-cleaner](https://rtyley.github.io/bfg-repo-cleaner/) - Removes large or troublesome blobs like git-filter-branch does, but faster.
216+
* [bfg repo-cleaner](https://rtyley.github.io/bfg-repo-cleaner/) - Removes large or troublesome blobs like `git filter-branch` does, but faster.
217217
* [bitbucket-git-helpers](https://github.com/unixorn/bitbucket-git-helpers.plugin.zsh) - Helper scripts to allow you to create bitbucket PRs from a shell session.
218218
* [blackbox](https://github.com/StackExchange/blackbox) - Tom Limoncelli open sourced the tool they use at Stack Exchange to use GPG to store secrets in a git repository.
219219
* [branch-manager](https://github.com/elstgav/branch-manager) - ZSH plugin for branch management
@@ -243,8 +243,8 @@ Here are some helpful aliases for your `~/.gitconfig`
243243
* [git-submodule-tools](https://github.com/kollerma/git-submodule-tools) - A collection of scripts that should help make life with git submodules easier.
244244
* [git-sweep](https://github.com/arc90/git-sweep) - A utility script to remove branches that have been merged to master.
245245
* [git-todo](https://github.com/ibolmo/git-todo/blob/master/git-todo) - helper script to show all the todo entries in your repo.
246+
* [git-up (gem)](https://github.com/aanand/git-up) - Fetch and rebase all locally-tracked remote branches.
246247
* [git-up (python)](https://pypi.python.org/pypi/git-up) - Python implementation of Aanand's original ruby gem
247-
* [git-up](https://github.com/aanand/git-up) - Fetch and rebase all locally-tracked remote branches.
248248
* [git-wayback-machine](https://github.com/MadRabbit/git-wayback-machine) - A simple script to quickly navigate a project's state through it's GIT history
249249
* [git_history_visualizer](https://github.com/kidpixo/git_history_visualizer) - python script to visualize the history of files in a git repository
250250
* [gitbaby](https://github.com/lordadamson/gitbaby) - Helper scripts to manage your git repositories

0 commit comments

Comments
 (0)