diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-08-12 13:17:01 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-08-12 16:16:03 +1000 |
| commit | f1753f36c828663951ffa2649be593ef4290ac40 (patch) | |
| tree | b844d5358213423f97df8ce671575b6faed77fa0 /README.md | |
| parent | 3ea81d4a6f8e9144b5896112a517ddf5c27373a2 (diff) | |
Add rebase from marked base commit test
This also fixes a bug where after the rebase each commit in the commits view had a tick against it because we hadn't
refreshed the view since the base commit was no longer marked
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -129,6 +129,12 @@ Learn more in the [Rebase magic Youtube tutorial](https://youtu.be/4XaToVut_hs).  +### Rebase from marked base commit + +Say you're on a feature branch that was itself branched off of the develop branch, and you've decided you'd rather be branching off the master branch. You need a way to rebase only the commits from your feature branch. In this demo we check to see which was the last commit on the develop branch, then press `shift+b` to mark that commit as our base commit, then press `r` on the master branch to rebase onto it, only bringing across the commits from our feature branch. Then we push our changes with `shift+p`. + + + ### Undo You can undo the last action by pressing 'z' and redo with `ctrl+z`. Here we drop a couple of commits and then undo the actions. |