Skip to content

Commit

Permalink
Updates rebase docs
Browse files Browse the repository at this point in the history
  • Loading branch information
eamodio committed Dec 20, 2020
1 parent 73585e4 commit d334ab9
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -544,20 +544,14 @@ The _Search & Compare_ view lists pinnable (saved) results for searching commit
- Adds a user-friendly interactive rebase editor to more easily configure an interactive rebase session
- Quickly re-order, edit, squash, and drop commits
- Includes drag & drop support!
- To use this feature:
- set VS Code as your default git editor
- To use this directly from your terminal, e.g. when running `git rebase -i`,

- set VS Code as your default Git editor
- `git config --global core.editor "code --wait"`
- open your global git config
- `git config --global -e`
- set VS Code as your `difftool`
- add or replace these entries:
```
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
```
- to use VS Code Insider's, replace `code` & `vscode` in the above with `code-insiders`
- or, to only affect rebase, set VS Code as your Git rebase editor
- `git config --global sequence.editor "code --wait"`

> To use the Insiders edition of VS Code, replace `code` in the above with `code-insiders`
## Terminal Links [#](#terminal-links- 'Terminal Links')

Expand Down

0 comments on commit d334ab9

Please sign in to comment.