diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-01-23 17:03:44 +0100 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2024-01-29 09:37:47 +0100 |
| commit | b133318b40f9863e9952dddd8acfeffa6dc95b71 (patch) | |
| tree | 012317915bba9ee915508e5727ef25e2fbd62060 /docs | |
| parent | 24e79a057c6ef39d5153a65cacedcdb419d9c7fd (diff) | |
Add command to squash all fixups in the current branch
To do that, change the "Apply fixup commits" command to show a menu with the two
choices "in current branch" and "above the selected commit"; we make "in current
branch" the default, as it's the more useful one most of the time, even though
it is a breaking change for those who are used to "shift-S enter" meaning
"squash above selected".
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 2 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ja.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 693c56359..550b3640f 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -89,7 +89,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ If you would instead like to start an interactive rebase from the selected commit, press `e`. | | `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. | | `` F `` | Create fixup commit | Create 'fixup!' commit for the selected commit. Later on, you can press `S` on this same commit to apply all above fixup commits. | -| `` S `` | Apply fixup commits | Squash all 'fixup!' commits above selected commit (autosquash). | +| `` S `` | Apply fixup commits | Squash all 'fixup!' commits, either above the selected commit, or all in current branch (autosquash). | | `` <c-j> `` | Move commit down one | | | `` <c-k> `` | Move commit up one | | | `` V `` | Paste (cherry-pick) | | diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index beb9ee3f4..b19f42fe7 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -106,7 +106,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ If you would instead like to start an interactive rebase from the selected commit, press `e`. | | `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. | | `` F `` | Create fixup commit | このコミットに対するfixupコミットを作成 | -| `` S `` | Apply fixup commits | Squash all 'fixup!' commits above selected commit (autosquash). | +| `` S `` | Apply fixup commits | Squash all 'fixup!' commits, either above the selected commit, or all in current branch (autosquash). | | `` <c-j> `` | コミットを1つ下に移動 | | | `` <c-k> `` | コミットを1つ上に移動 | | | `` V `` | コミットを貼り付け (cherry-pick) | | |