Skip to content
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.

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

Make unrecoverable command hard to invoke #42

Merged
merged 4 commits into from
Aug 17, 2020
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
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ $ omf install https://github.com/jhillyerd/plugin-git
| grbmia | `git rebase master --interactive --autosquash` |
| grbd | `git rebase develop` |
| grbdd | `git rebase develop --interactive` |
| grbdia | `git rebase develop --interactive --autosquash` |
| grbdia | `git rebase develop --interactive --autosquash` |
| grbs | `git rebase --skip` |
| ggu | fetch & rebase _current-branch_ on top of the upstream branch |

Expand Down Expand Up @@ -209,7 +209,9 @@ $ omf install https://github.com/jhillyerd/plugin-git
| gbl | `git blame -b -w` |
| gcf | `git config --list` |
| gcl | `git clone` |
| gclean | pristine working directory: reset and force clean |
| gclean | `git clean -di` |
| gclean! | `git clean -dfx` |
| gclean!! | `git reset --hard; and git clean -dfx` |
| gcp | `git cherry-pick` |
| gcpa | `git cherry-pick --abort` |
| gcpc | `git cherry-pick --continue` |
Expand Down
3 changes: 0 additions & 3 deletions functions/gclean.fish

This file was deleted.

3 changes: 3 additions & 0 deletions init.fish
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ __git_abbr gcm git commit -m
__git_abbr gcam git commit -a -m
__git_abbr gscam git commit -S -a -m
__git_abbr gcl git clone
__git_abbr gclean git clean -di
__git_abbr gclean! git clean -dfx
__git_abbr gclean!! "git reset --hard; and git clean -dfx"
__git_abbr gcount git shortlog -sn
__git_abbr gcp git cherry-pick
__git_abbr gcpa git cherry-pick --abort
Expand Down