How to do a rebase with git gui?

后端 未结 4 736
独厮守ぢ
独厮守ぢ 2021-01-31 07:42

I know how to do a git rebase from the command line, but how do you do it with the official git-gui?

4条回答
  •  無奈伤痛
    2021-01-31 08:07

    You can do a full interactive rebase with git gui, complete with commit selection, rewording and conflict resolution! In addition to Ted Percival's answer, Add this to your ~/.gitconfig:

    [guitool "Rebase interactive"]
        cmd = EDITOR=gvim git rebase -i $REVISION
        revprompt = yes
    

    You must use a graphical editor -- plain old vim won't work, but gvim will. You may use any gui editor, I use nedit for example. A separate window of this editor will pop-up any time you need to input something: initially selecting commits, rewording commit messages (whether for reword or squash commits), etc.

提交回复
热议问题