Updated Interactive Rebasing (markdown)

Jesse Duffield 2019-11-09 21:51:45 +11:00
parent d9a604f064
commit 4868fa3690

@ -187,7 +187,7 @@ If you only need to perform one operation on a single commit, using this todo-ap
![](https://i.imgur.com/OsP2CwX.png)
Behind the scenes this begins an interactive rebase, creates the todo file, sets the command to 'squash', and continues. The same short-hand approach is supported for dropping, squashing, fixing up, and rewording commits, using the 'd', 's', 'f', and 'r' keybindings respectively.
Behind the scenes this begins an interactive rebase, creates the todo file, sets the command to 'squash', and continues. The same short-hand approach is supported for dropping, squashing, fixing up, and rewording commits, using the 'd', 's', 'f', and 'r' keybindings respectively. You can even shift a commit up one with ctrl+K and down one with ctrl+J
## Conflicts