Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
After a rebase failed with a conflict, I could not continue the rebase using a Git GUI client. When performing
git rebase --continue
on command line (msysgit 1.7.4), it opened a text editor. After having closed it, Git continued. How can opening the editor be avoided?
When a rebase fails, you have to manually fix the file and then exec
git add filenameto signal that everything is OK. At this point,git rebase --continuewill continue the procedure without bothering you.To change the default editor git uses issue:
git config --global core.editor new_editor