summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2024-03-23 20:48:54 +1100
committerGitHub <noreply@github.com>2024-03-23 20:48:54 +1100
commit1337a943fe06c58e4f7783ddad4c2d7f91d43054 (patch)
tree12c47d72bc136cf1a4954865478ad683966eeefe /README.md
parent3675570a391b1a49ddd198b4c7e71e17701d4404 (diff)
parent471ea397582775476d5636c6c5179b89e411e4e9 (diff)
Update interactive rebase demo (#3392)
**PR Description** This is in anticipation of the new release which supports range-select. - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [x] Docs (specifically `docs/Config.md`) have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->
Diffstat (limited to 'README.md')
-rw-r--r--README.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/README.md b/README.md
index ea8ae2bc7..879d2982b 100644
--- a/README.md
+++ b/README.md
@@ -114,10 +114,12 @@ Press space on the selected line to stage it, or press `v` to start selecting a
### Interactive Rebase
-Press `e` on a commit to start an interactive rebase on it: causing all above commits to become part of the TODO file. Then squash (`s`), fixup (`f`), drop (`d`), edit (`e`), move up (`ctrl+i`) or move down (`ctrl+j`) any of TODO commits, before continuing the rebase by bringing up the rebase options menu with `m` and then selecting `continue`.
+Press `i` to start an interactive rebase. Then squash (`s`), fixup (`f`), drop (`d`), edit (`e`), move up (`ctrl+i`) or move down (`ctrl+j`) any of TODO commits, before continuing the rebase by bringing up the rebase options menu with `m` and then selecting `continue`.
You can also perform any these actions as a once-off (e.g. pressing `s` on a commit to squash it) without explicitly starting a rebase.
+This demo also uses shift+down to select a range of commits to move and fixup.
+
![interactive_rebase](../assets/demo/interactive_rebase-compressed.gif)
### Cherry-pick
@@ -314,6 +316,7 @@ Funtoo Linux has an autogenerated lazygit package in [dev-kit](https://github.co
```sh
sudo emerge dev-vcs/lazygit
```
+
### Gentoo Linux
Lazygit is not (yet) in main Gentoo portage, however an ebuild is available in [GURU overlay](https://github.com/gentoo-mirror/guru/tree/master/dev-vcs/lazygit)