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

Add git-abort #865

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Add git-abort #865

merged 1 commit into from
Jul 8, 2021

Conversation

pkitszel
Copy link
Contributor

@pkitszel pkitszel commented Aug 5, 2020

New subcommand just calls git $op --abort, where $op is current git operation, like rebase

@pkitszel
Copy link
Contributor Author

pkitszel commented Aug 5, 2020

Hi,

my proposed command is really useful for me, despite being so simple :)
If this PR would be accepted, I will submit another one with similar git-continue ;) (too bad, that symlinks support is not great in git...).

PK

@bl-ue
Copy link

bl-ue commented May 22, 2021

ping @spacewander looks cool, could you please merge?

@pkitszel there are merge conflicts, could you please fix those?

@spacewander
Copy link
Collaborator

I will take a look after the conflict is solved.

New subcommand just calls git $op --abort, where $op is current git operation, like rebase
@pkitszel pkitszel force-pushed the pkitszel-git-abort branch from 631bacc to b8e58ee Compare July 5, 2021 21:43
@pkitszel
Copy link
Contributor Author

pkitszel commented Jul 5, 2021

@spacewander, I have resolved the conflict.

@spacewander spacewander merged commit d28ad34 into tj:master Jul 8, 2021
oikarinen added a commit to oikarinen/git-extras that referenced this pull request Nov 4, 2024
Also refactor `git-abort` to parse action from the called file name.

There's a promise for this in tj#865 but that was a long time ago.
oikarinen added a commit to oikarinen/git-extras that referenced this pull request Nov 4, 2024
Also refactor `git-abort` to parse action from the called file name.

There's a promise for this in tj#865 but that was a long time ago.
@oikarinen oikarinen mentioned this pull request Nov 4, 2024
oikarinen added a commit to oikarinen/git-extras that referenced this pull request Nov 18, 2024
Also refactor `git-abort` to parse action from the called file name.

There's a promise for this in tj#865 but that was a long time ago.
oikarinen added a commit to oikarinen/git-extras that referenced this pull request Nov 22, 2024
Also refactor `git-abort` to parse action from the called file name.

There's a promise for this in tj#865 but that was a long time ago.
spacewander pushed a commit that referenced this pull request Nov 28, 2024
* feat: add git-continue

Also refactor `git-abort` to parse action from the called file name.

There's a promise for this in #865 but that was a long time ago.

* fix: add git-continue

address review comments, fix the script, remove unnecessary testpath
import.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants