Implement inverse of git push --force #24
Conversation
| @@ -624,6 +624,9 @@ | |||
| # Get the current branch name | |||
| branch-name = rev-parse --abbrev-ref HEAD | |||
|
|
|||
| # Get name of the upstream branch | |||
| upstream-name = !git for-each-ref --format='%(upstream:short)' $(git symbolic-ref -q HEAD) | |||
There was a problem hiding this comment.
Agree. That's a great quick win.
There was a problem hiding this comment.
Your other change added the upstream-name command. Great idea.
Do you intend for your new reset command to make use of your upstream-name command?
I would expect something like this:
reset-to-upstream = !git reset --hard $(git upstream-name)
Is this what you intend?
It's like git push --force, but in the other direction.
|
Yes. I originally chose a different name for the command and I forgot to change the reference to |
| @@ -505,6 +505,7 @@ | |||
| reset-commit = reset --soft HEAD~1 | |||
| reset-commit-hard = reset --hard HEAD~1 | |||
| reset-commit-clean = !git reset --hard HEAD~1 && git clean -fd | |||
| reset-to-origin = !git reset --hard $(git remote-branch-name) | |||
There was a problem hiding this comment.
What is remote-branch-name? upstream-name, no?
|
Ok good. In git, the "upstream" and "origin" can be different. I'll add the This is a useful item: |
No description provided.