Skip to content

Fix typos #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 28, 2016
Merged

Fix typos #21

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
731f209
s/changlog/changelog/
unixorn Nov 28, 2016
98976f1
Use zgen reset instead of directly removing init.zsh
unixorn Nov 28, 2016
28cc5fa
Add missing . to git-todo and git-up entries
unixorn Nov 28, 2016
63e46ad
Fix formatting in git-change-log entry
unixorn Nov 28, 2016
5ef6717
Fix formatting in git-clone-subset entry
unixorn Nov 28, 2016
6e8a42e
Fix git-edit-conflicts entry formatting
unixorn Nov 28, 2016
a5123ed
Format fixup for git-rebase-authors entry
unixorn Nov 28, 2016
fb1286e
Reformat git-wtf entry
unixorn Nov 28, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix git-edit-conflicts entry formatting
  • Loading branch information
@unixorn
unixorn committed Nov 28, 2016
commit 6e8a42e1f6f823e9ec3e41caba74fca1abb0c8e4
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ If you aren't using any zsh frameworks, or if you're a bash user, do the followi
| `git-delete-merged-branches` | ? | Purges all branches that have been merged to a target branch (defaults to branches merged to master) |
| `git-delete-tag` | Joe Block <jpb@unixorn.net> | Delete a tag, both locally and from the origin remote |
| `git-divergence` | Gary Bernhardt's [dotfiles](https://github.com/garybernhardt/dotfiles/blob/master/bin/git-churn) | Shows differences between local branch and its tracking branch |
| `git-edit-conflicts` | Joe Block <jpb@unixorn.net> | Edit the files that are marked as conflicted during a merge/rebase in your $EDITOR/$VISUAL |
| `git-edit-conflicts` | Joe Block <jpb@unixorn.net> | Edit the files that are marked as conflicted during a merge/rebase in your `$EDITOR/$VISUAL` |
| `git-find-dirty` | Matthew McCullough's [scripts](https://github.com/matthewmccullough/scripts/) repository | |
| `git-flush` | John Wiegley's [git-scripts](https://github.com/jwiegley/git-scripts) | Compact your reposistory by dropping all reflogs, stashes, and other cruft that may be bloating your pack files|
| `git-force-mtimes` | John Wiegley's [git-scripts](https://github.com/jwiegley/git-scripts) | Sets mtimes of all files in the reprository their last change date based on git's log. Useful to avoid too new dates after a checkout. |
Expand Down