Menu
when I do interactive git-rebase:
git rebase -i HEAD~2
it shows:
C:\GnuWin32\bin\grep.exe: /cygdrive/xxx/.git/rebase-merge/git-rebase-todo: No such file or directory Nothing to do
(xxx is the project path)
but git rebase branch_xxx is working.
I am sure no rebase is in progress previous(checking with git rebase --abort and use clean project folder both)
have some one solved this ? I google it but wihtout useful tips.
684
You can run git rebase --abort to completely undo the rebase. Git will return you to your branch's state as it was before git rebase was called. You can run git rebase --skip to completely skip the commit.
Rebasing is the process of moving or combining a sequence of commits to a new base commit. Rebasing is most useful and easily visualized in the context of a feature branching workflow.
You can run git rebase --skip to completely skip the commit. That means that none of the changes introduced by the problematic commit will be included. It is very rare that you would choose this option.
But, instead of using a merge commit, rebasing re-writes the project history by creating brand new commits for each commit in the original branch. The major benefit of rebasing is that you get a much cleaner project history. First, it eliminates the unnecessary merge commits required by git merge .
My problem was due to my gitconfig missing the -w and -n flags:
[core]
editor = sublime -w -n
From Code Project:
[The -w and -n arguments are] passed to Sublime Text, and essentially tell it to run without loading any previously open windows (the –n flag), and to wait until the user exits to pass execution back to the calling process (the –w flag, for "wait")
143
For vs code it means that forgot to pass the wait flag to code.
wrong:
editor = code
correct:
editor = code --wait
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
