Git rebase for fish - Githubissues

wfxr / forgit

:zzz: A utility tool powered by fzf for using git interactively.

MIT License

4.4k stars 137 forks source link

Git rebase for fish #123

Closed cjappl closed 3 years ago

cjappl commented 3 years ago

Check list

[x] I have performed a self-review of my code
[x] I have commented my code in hard-to-understand areas
[x] I have made corresponding changes to the documentation

Description

Type of change

[ ] Bug fix
[x] New feature
[ ] Refactor
[ ] Breaking change
[ ] Documentation change

Test environment

Shell
- [ ] bash
- [ ] zsh
- [x] fish
OS
- [ ] Linux
- [x] Mac OS X
- [ ] Windows
- [ ] Others:

cjappl commented 3 years ago

@wfxr again I'm not sure why there are so many commits here....

Anything I can do to get this down to the one commit I made?

wfxr commented 3 years ago

@cjappl Have you run git rebase -i or grb locally before pushing to your repo? git rebase -i will update every selected commit hashes even if you do nothing but quitting the editor.

wfxr commented 3 years ago

Anything I can do to get this down to the one commit I made?

I think the easiest way is clone the repo again and apply the changes.

Since you are a collaborator of this repo, I suggest you work on this original repo directly. You can checkout and push a new branch to make a pull request like normal if you do some changes that need to be reviewd. BTW don't forget to run git pull origin master --rebase locally before doing changes to avoid unnecessary conflict.

cjappl commented 3 years ago

Good idea, I'll try to work directly when I need to from now on. Probably easier than untangling mine

Closing in favor of #124