mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-21 12:16:54 +02:00
Add a command to select all commits of the current branch
This is useful for seeing the combined diff of all commits of a branch.
This commit is contained in:
parent
7bccf848af
commit
80b5e21bd5
@ -616,6 +616,7 @@ keybinding:
|
|||||||
openInBrowser: o
|
openInBrowser: o
|
||||||
viewBisectOptions: b
|
viewBisectOptions: b
|
||||||
startInteractiveRebase: i
|
startInteractiveRebase: i
|
||||||
|
selectCommitsOfCurrentBranch: '*'
|
||||||
amendAttribute:
|
amendAttribute:
|
||||||
resetAuthor: a
|
resetAuthor: a
|
||||||
setAuthor: A
|
setAuthor: A
|
||||||
|
@ -111,6 +111,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
||||||
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View files | |
|
| `` <enter> `` | View files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Search the current view by text | |
|
| `` / `` | Search the current view by text | |
|
||||||
@ -262,6 +263,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View commits | |
|
| `` <enter> `` | View commits | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Filter the current view by text | |
|
| `` / `` | Filter the current view by text | |
|
||||||
@ -331,6 +333,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View files | |
|
| `` <enter> `` | View files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Search the current view by text | |
|
| `` / `` | Search the current view by text | |
|
||||||
|
@ -77,6 +77,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View files | |
|
| `` <enter> `` | View files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | 検索を開始 | |
|
| `` / `` | 検索を開始 | |
|
||||||
@ -125,6 +126,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
||||||
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View files | |
|
| `` <enter> `` | View files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | 検索を開始 | |
|
| `` / `` | 検索を開始 | |
|
||||||
@ -363,6 +365,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | コミットを閲覧 | |
|
| `` <enter> `` | コミットを閲覧 | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Filter the current view by text | |
|
| `` / `` | Filter the current view by text | |
|
||||||
|
@ -64,6 +64,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
|
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | 커밋 보기 | |
|
| `` <enter> `` | 커밋 보기 | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Filter the current view by text | |
|
| `` / `` | Filter the current view by text | |
|
||||||
@ -94,6 +95,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
|
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View selected item's files | |
|
| `` <enter> `` | View selected item's files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | 검색 시작 | |
|
| `` / `` | 검색 시작 | |
|
||||||
@ -290,6 +292,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
||||||
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View selected item's files | |
|
| `` <enter> `` | View selected item's files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | 검색 시작 | |
|
| `` / `` | 검색 시작 | |
|
||||||
|
@ -177,6 +177,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
| `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
||||||
| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Bekijk gecommite bestanden | |
|
| `` <enter> `` | Bekijk gecommite bestanden | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Start met zoeken | |
|
| `` / `` | Start met zoeken | |
|
||||||
@ -240,6 +241,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
|
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Bekijk commits | |
|
| `` <enter> `` | Bekijk commits | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Filter the current view by text | |
|
| `` / `` | Filter the current view by text | |
|
||||||
@ -331,6 +333,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
|
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Bekijk gecommite bestanden | |
|
| `` <enter> `` | Bekijk gecommite bestanden | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Start met zoeken | |
|
| `` / `` | Start met zoeken | |
|
||||||
|
@ -85,6 +85,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
|
|||||||
| `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
|
| `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
|
||||||
| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
|
| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
|
||||||
| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | |
|
| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Wyświetl pliki | |
|
| `` <enter> `` | Wyświetl pliki | |
|
||||||
| `` w `` | Zobacz opcje drzewa pracy | |
|
| `` w `` | Zobacz opcje drzewa pracy | |
|
||||||
| `` / `` | Szukaj w bieżącym widoku po tekście | |
|
| `` / `` | Szukaj w bieżącym widoku po tekście | |
|
||||||
@ -272,6 +273,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
|
|||||||
| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
|
| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
|
||||||
| `` <c-r> `` | Resetuj wybrane (cherry-picked) commity | |
|
| `` <c-r> `` | Resetuj wybrane (cherry-picked) commity | |
|
||||||
| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | |
|
| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Pokaż commity | |
|
| `` <enter> `` | Pokaż commity | |
|
||||||
| `` w `` | Zobacz opcje drzewa pracy | |
|
| `` w `` | Zobacz opcje drzewa pracy | |
|
||||||
| `` / `` | Filtruj bieżący widok po tekście | |
|
| `` / `` | Filtruj bieżący widok po tekście | |
|
||||||
@ -312,6 +314,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
|
|||||||
| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
|
| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
|
||||||
| `` <c-r> `` | Resetuj wybrane (cherry-picked) commity | |
|
| `` <c-r> `` | Resetuj wybrane (cherry-picked) commity | |
|
||||||
| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | |
|
| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Wyświetl pliki | |
|
| `` <enter> `` | Wyświetl pliki | |
|
||||||
| `` w `` | Zobacz opcje drzewa pracy | |
|
| `` w `` | Zobacz opcje drzewa pracy | |
|
||||||
| `` / `` | Szukaj w bieżącym widoku po tekście | |
|
| `` / `` | Szukaj w bieżącym widoku po tekście | |
|
||||||
|
@ -183,6 +183,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
||||||
| `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
|
| `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
|
||||||
| `` <c-t> `` | Abrir ferramenta de diff externa (git difftool) | |
|
| `` <c-t> `` | Abrir ferramenta de diff externa (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View files | |
|
| `` <enter> `` | View files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Search the current view by text | |
|
| `` / `` | Search the current view by text | |
|
||||||
@ -292,6 +293,7 @@ Veja a documentação:
|
|||||||
| `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
|
| `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
|
||||||
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
||||||
| `` <c-t> `` | Abrir ferramenta de diff externa (git difftool) | |
|
| `` <c-t> `` | Abrir ferramenta de diff externa (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View commits | |
|
| `` <enter> `` | View commits | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Filter the current view by text | |
|
| `` / `` | Filter the current view by text | |
|
||||||
@ -343,6 +345,7 @@ Veja a documentação:
|
|||||||
| `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
|
| `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
|
||||||
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
|
||||||
| `` <c-t> `` | Abrir ferramenta de diff externa (git difftool) | |
|
| `` <c-t> `` | Abrir ferramenta de diff externa (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | View files | |
|
| `` <enter> `` | View files | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Search the current view by text | |
|
| `` / `` | Search the current view by text | |
|
||||||
|
@ -134,6 +134,7 @@ _Связки клавиш_
|
|||||||
| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
|
| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Просмотреть коммиты | |
|
| `` <enter> `` | Просмотреть коммиты | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Filter the current view by text | |
|
| `` / `` | Filter the current view by text | |
|
||||||
@ -172,6 +173,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
| `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
||||||
| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Просмотреть файлы выбранного элемента | |
|
| `` <enter> `` | Просмотреть файлы выбранного элемента | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Найти | |
|
| `` / `` | Найти | |
|
||||||
@ -231,6 +233,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
|
| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
|
||||||
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
| `` <c-t> `` | Open external diff tool (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | Просмотреть файлы выбранного элемента | |
|
| `` <enter> `` | Просмотреть файлы выбранного элемента | |
|
||||||
| `` w `` | View worktree options | |
|
| `` w `` | View worktree options | |
|
||||||
| `` / `` | Найти | |
|
| `` / `` | Найти | |
|
||||||
|
@ -64,6 +64,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
|
|||||||
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,你可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
|
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,你可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
|
||||||
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
|
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
|
||||||
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
|
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | 查看提交 | |
|
| `` <enter> `` | 查看提交 | |
|
||||||
| `` w `` | 查看工作区选项 | |
|
| `` w `` | 查看工作区选项 | |
|
||||||
| `` / `` | 通过文本过滤当前视图 | |
|
| `` / `` | 通过文本过滤当前视图 | |
|
||||||
@ -108,6 +109,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
|
|||||||
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,你可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
|
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,你可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
|
||||||
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
|
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
|
||||||
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
|
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | 查看提交的文件 | |
|
| `` <enter> `` | 查看提交的文件 | |
|
||||||
| `` w `` | 查看工作区选项 | |
|
| `` w `` | 查看工作区选项 | |
|
||||||
| `` / `` | 开始搜索 | |
|
| `` / `` | 开始搜索 | |
|
||||||
@ -170,6 +172,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
|
|||||||
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
|
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
|
||||||
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,你可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
|
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,你可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
|
||||||
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
|
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | 查看提交的文件 | |
|
| `` <enter> `` | 查看提交的文件 | |
|
||||||
| `` w `` | 查看工作区选项 | |
|
| `` w `` | 查看工作区选项 | |
|
||||||
| `` / `` | 开始搜索 | |
|
| `` / `` | 开始搜索 | |
|
||||||
|
@ -132,6 +132,7 @@ _說明:`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B,`B`表示 Shift+B
|
|||||||
| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
|
| `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
|
||||||
| `` <c-t> `` | 開啟外部差異工具 (git difftool) | |
|
| `` <c-t> `` | 開啟外部差異工具 (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | 檢視所選項目的檔案 | |
|
| `` <enter> `` | 檢視所選項目的檔案 | |
|
||||||
| `` w `` | 檢視工作目錄選項 | |
|
| `` w `` | 檢視工作目錄選項 | |
|
||||||
| `` / `` | 搜尋 | |
|
| `` / `` | 搜尋 | |
|
||||||
@ -194,6 +195,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
|
||||||
| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-t> `` | 開啟外部差異工具 (git difftool) | |
|
| `` <c-t> `` | 開啟外部差異工具 (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | 檢視所選項目的檔案 | |
|
| `` <enter> `` | 檢視所選項目的檔案 | |
|
||||||
| `` w `` | 檢視工作目錄選項 | |
|
| `` w `` | 檢視工作目錄選項 | |
|
||||||
| `` / `` | 搜尋 | |
|
| `` / `` | 搜尋 | |
|
||||||
@ -250,6 +252,7 @@ If you would instead like to start an interactive rebase from the selected commi
|
|||||||
| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
|
||||||
| `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
|
| `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
|
||||||
| `` <c-t> `` | 開啟外部差異工具 (git difftool) | |
|
| `` <c-t> `` | 開啟外部差異工具 (git difftool) | |
|
||||||
|
| `` * `` | Select commits of current branch | |
|
||||||
| `` <enter> `` | 檢視提交 | |
|
| `` <enter> `` | 檢視提交 | |
|
||||||
| `` w `` | 檢視工作目錄選項 | |
|
| `` w `` | 檢視工作目錄選項 | |
|
||||||
| `` / `` | 搜尋 | |
|
| `` / `` | 搜尋 | |
|
||||||
|
@ -516,6 +516,7 @@ type KeybindingCommitsConfig struct {
|
|||||||
OpenInBrowser string `yaml:"openInBrowser"`
|
OpenInBrowser string `yaml:"openInBrowser"`
|
||||||
ViewBisectOptions string `yaml:"viewBisectOptions"`
|
ViewBisectOptions string `yaml:"viewBisectOptions"`
|
||||||
StartInteractiveRebase string `yaml:"startInteractiveRebase"`
|
StartInteractiveRebase string `yaml:"startInteractiveRebase"`
|
||||||
|
SelectCommitsOfCurrentBranch string `yaml:"selectCommitsOfCurrentBranch"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type KeybindingAmendAttributeConfig struct {
|
type KeybindingAmendAttributeConfig struct {
|
||||||
@ -991,6 +992,7 @@ func GetDefaultConfig() *UserConfig {
|
|||||||
OpenInBrowser: "o",
|
OpenInBrowser: "o",
|
||||||
ViewBisectOptions: "b",
|
ViewBisectOptions: "b",
|
||||||
StartInteractiveRebase: "i",
|
StartInteractiveRebase: "i",
|
||||||
|
SelectCommitsOfCurrentBranch: "*",
|
||||||
},
|
},
|
||||||
AmendAttribute: KeybindingAmendAttributeConfig{
|
AmendAttribute: KeybindingAmendAttributeConfig{
|
||||||
ResetAuthor: "a",
|
ResetAuthor: "a",
|
||||||
|
@ -7,9 +7,11 @@ import (
|
|||||||
|
|
||||||
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
|
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
|
||||||
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/gui/context/traits"
|
||||||
"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
|
"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
|
||||||
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
||||||
"github.com/jesseduffield/lazygit/pkg/utils"
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
||||||
|
"github.com/samber/lo"
|
||||||
)
|
)
|
||||||
|
|
||||||
// This controller is for all contexts that contain a list of commits.
|
// This controller is for all contexts that contain a list of commits.
|
||||||
@ -23,6 +25,8 @@ type ContainsCommits interface {
|
|||||||
GetSelectedItems() ([]*models.Commit, int, int)
|
GetSelectedItems() ([]*models.Commit, int, int)
|
||||||
GetCommits() []*models.Commit
|
GetCommits() []*models.Commit
|
||||||
GetSelectedLineIdx() int
|
GetSelectedLineIdx() int
|
||||||
|
GetSelectionRangeAndMode() (int, int, traits.RangeSelectMode)
|
||||||
|
SetSelectionRangeAndMode(int, int, traits.RangeSelectMode)
|
||||||
}
|
}
|
||||||
|
|
||||||
type BasicCommitsController struct {
|
type BasicCommitsController struct {
|
||||||
@ -109,6 +113,12 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
|
|||||||
GetDisabledReason: self.require(self.singleItemSelected()),
|
GetDisabledReason: self.require(self.singleItemSelected()),
|
||||||
Description: self.c.Tr.OpenDiffTool,
|
Description: self.c.Tr.OpenDiffTool,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
Key: opts.GetKey(opts.Config.Commits.SelectCommitsOfCurrentBranch),
|
||||||
|
Handler: self.selectCommitsOfCurrentBranch,
|
||||||
|
GetDisabledReason: self.require(self.canSelectCommitsOfCurrentBranch),
|
||||||
|
Description: self.c.Tr.SelectCommitsOfCurrentBranch,
|
||||||
|
},
|
||||||
// Putting this at the bottom of the list so that it has the lowest priority,
|
// Putting this at the bottom of the list so that it has the lowest priority,
|
||||||
// meaning that if the user has configured another keybinding to the same key
|
// meaning that if the user has configured another keybinding to the same key
|
||||||
// then that will take precedence.
|
// then that will take precedence.
|
||||||
@ -389,3 +399,41 @@ func (self *BasicCommitsController) openDiffTool(commit *models.Commit) error {
|
|||||||
}))
|
}))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *BasicCommitsController) canSelectCommitsOfCurrentBranch() *types.DisabledReason {
|
||||||
|
if index := self.findFirstCommitAfterCurrentBranch(); index <= 0 {
|
||||||
|
return &types.DisabledReason{Text: self.c.Tr.NoCommitsThisBranch}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *BasicCommitsController) findFirstCommitAfterCurrentBranch() int {
|
||||||
|
_, index, ok := lo.FindIndexOf(self.context.GetCommits(), func(c *models.Commit) bool {
|
||||||
|
return c.IsMerge() || c.Status == models.StatusMerged
|
||||||
|
})
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
return index
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *BasicCommitsController) selectCommitsOfCurrentBranch() error {
|
||||||
|
index := self.findFirstCommitAfterCurrentBranch()
|
||||||
|
if index <= 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
_, _, mode := self.context.GetSelectionRangeAndMode()
|
||||||
|
if mode != traits.RangeSelectModeSticky {
|
||||||
|
// If we are in sticky range mode already, keep that; otherwise, open a non-sticky range
|
||||||
|
mode = traits.RangeSelectModeNonSticky
|
||||||
|
}
|
||||||
|
// Create the range from bottom to top, so that when you cancel the range,
|
||||||
|
// the head commit is selected
|
||||||
|
self.context.SetSelectionRangeAndMode(0, index-1, mode)
|
||||||
|
self.context.HandleFocus(types.OnFocusOpts{})
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
@ -861,6 +861,7 @@ type TranslationSet struct {
|
|||||||
CommandDoesNotSupportOpeningInEditor string
|
CommandDoesNotSupportOpeningInEditor string
|
||||||
CustomCommands string
|
CustomCommands string
|
||||||
NoApplicableCommandsInThisContext string
|
NoApplicableCommandsInThisContext string
|
||||||
|
SelectCommitsOfCurrentBranch string
|
||||||
Actions Actions
|
Actions Actions
|
||||||
Bisect Bisect
|
Bisect Bisect
|
||||||
Log Log
|
Log Log
|
||||||
@ -1918,6 +1919,7 @@ func EnglishTranslationSet() *TranslationSet {
|
|||||||
CommandDoesNotSupportOpeningInEditor: "This command doesn't support switching to the editor",
|
CommandDoesNotSupportOpeningInEditor: "This command doesn't support switching to the editor",
|
||||||
CustomCommands: "Custom commands",
|
CustomCommands: "Custom commands",
|
||||||
NoApplicableCommandsInThisContext: "(No applicable commands in this context)",
|
NoApplicableCommandsInThisContext: "(No applicable commands in this context)",
|
||||||
|
SelectCommitsOfCurrentBranch: "Select commits of current branch",
|
||||||
|
|
||||||
Actions: Actions{
|
Actions: Actions{
|
||||||
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
|
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
|
||||||
|
@ -0,0 +1,74 @@
|
|||||||
|
package branch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/config"
|
||||||
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||||
|
)
|
||||||
|
|
||||||
|
var SelectCommitsOfCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{
|
||||||
|
Description: "Select all commits of the current branch",
|
||||||
|
ExtraCmdArgs: []string{},
|
||||||
|
Skip: false,
|
||||||
|
SetupConfig: func(config *config.AppConfig) {},
|
||||||
|
SetupRepo: func(shell *Shell) {
|
||||||
|
shell.EmptyCommit("master 01")
|
||||||
|
shell.EmptyCommit("master 02")
|
||||||
|
shell.NewBranch("branch1")
|
||||||
|
shell.CreateNCommits(2)
|
||||||
|
shell.NewBranchFrom("branch2", "master")
|
||||||
|
shell.CreateNCommits(3)
|
||||||
|
},
|
||||||
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
|
t.Views().Commits().
|
||||||
|
Focus().
|
||||||
|
Lines(
|
||||||
|
Contains("commit 03").IsSelected(),
|
||||||
|
Contains("commit 02"),
|
||||||
|
Contains("commit 01"),
|
||||||
|
Contains("master 02"),
|
||||||
|
Contains("master 01"),
|
||||||
|
).
|
||||||
|
Press(keys.Commits.SelectCommitsOfCurrentBranch).
|
||||||
|
Lines(
|
||||||
|
Contains("commit 03").IsSelected(),
|
||||||
|
Contains("commit 02").IsSelected(),
|
||||||
|
Contains("commit 01").IsSelected(),
|
||||||
|
Contains("master 02"),
|
||||||
|
Contains("master 01"),
|
||||||
|
).
|
||||||
|
PressEscape().
|
||||||
|
Lines(
|
||||||
|
Contains("commit 03").IsSelected(),
|
||||||
|
Contains("commit 02"),
|
||||||
|
Contains("commit 01"),
|
||||||
|
Contains("master 02"),
|
||||||
|
Contains("master 01"),
|
||||||
|
)
|
||||||
|
|
||||||
|
t.Views().Branches().
|
||||||
|
Focus().
|
||||||
|
Lines(
|
||||||
|
Contains("branch2").IsSelected(),
|
||||||
|
Contains("branch1"),
|
||||||
|
Contains("master"),
|
||||||
|
).
|
||||||
|
SelectNextItem().
|
||||||
|
PressEnter()
|
||||||
|
|
||||||
|
t.Views().SubCommits().
|
||||||
|
IsFocused().
|
||||||
|
Lines(
|
||||||
|
Contains("commit 02").IsSelected(),
|
||||||
|
Contains("commit 01"),
|
||||||
|
Contains("master 02"),
|
||||||
|
Contains("master 01"),
|
||||||
|
).
|
||||||
|
Press(keys.Commits.SelectCommitsOfCurrentBranch).
|
||||||
|
Lines(
|
||||||
|
Contains("commit 02").IsSelected(),
|
||||||
|
Contains("commit 01").IsSelected(),
|
||||||
|
Contains("master 02"),
|
||||||
|
Contains("master 01"),
|
||||||
|
)
|
||||||
|
},
|
||||||
|
})
|
@ -69,6 +69,7 @@ var tests = []*components.IntegrationTest{
|
|||||||
branch.Rename,
|
branch.Rename,
|
||||||
branch.Reset,
|
branch.Reset,
|
||||||
branch.ResetToUpstream,
|
branch.ResetToUpstream,
|
||||||
|
branch.SelectCommitsOfCurrentBranch,
|
||||||
branch.SetUpstream,
|
branch.SetUpstream,
|
||||||
branch.ShowDivergenceFromBaseBranch,
|
branch.ShowDivergenceFromBaseBranch,
|
||||||
branch.ShowDivergenceFromUpstream,
|
branch.ShowDivergenceFromUpstream,
|
||||||
|
@ -938,6 +938,10 @@
|
|||||||
"startInteractiveRebase": {
|
"startInteractiveRebase": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"default": "i"
|
"default": "i"
|
||||||
|
},
|
||||||
|
"selectCommitsOfCurrentBranch": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user