Skip to content

Commit c3c7e73

Browse files
authored
Merge branch 'master' into master
2 parents ff464c0 + 5b86716 commit c3c7e73

35 files changed

+353
-63
lines changed

docs/keybindings/Keybindings_en.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
2424
| `` R `` | Refresh | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
2525
| `` + `` | Next screen mode (normal/half/fullscreen) | |
2626
| `` _ `` | Prev screen mode | |
27+
| `` <esc> `` | Cancel | |
2728
| `` ? `` | Open keybindings menu | |
2829
| `` <c-s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |
2930
| `` W `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
@@ -257,7 +258,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
257258
| Key | Action | Info |
258259
|-----|--------|-------------|
259260
| `` <enter> `` | Execute | |
260-
| `` <esc> `` | Close | |
261+
| `` <esc> `` | Close/Cancel | |
261262
| `` / `` | Filter the current view by text | |
262263

263264
## Reflog

docs/keybindings/Keybindings_ja.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _凡例:`<c-b>` はctrl+b、`<a-b>` はalt+b、`B` はshift+bを意味
2424
| `` R `` | 更新 | Gitの状態を更新します(`git status``git branch`などをバックグラウンドで実行してパネルの内容を更新します)。これは`git fetch`を実行しません。 |
2525
| `` + `` | 次の画面モード(通常/半分/全画面) | |
2626
| `` _ `` | 前の画面モード | |
27+
| `` <esc> `` | キャンセル | |
2728
| `` ? `` | キーバインディングメニューを開く | |
2829
| `` <c-s> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |
2930
| `` W `` | 差分オプションを表示 | 2つのrefの差分に関連するオプションを表示します(例:選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など)。 |
@@ -303,7 +304,7 @@ _凡例:`<c-b>` はctrl+b、`<a-b>` はalt+b、`B` はshift+bを意味
303304
| Key | Action | Info |
304305
|-----|--------|-------------|
305306
| `` <enter> `` | 実行 | |
306-
| `` <esc> `` | 閉じる | |
307+
| `` <esc> `` | 閉じる/キャンセル | |
307308
| `` / `` | 現在のビューをテキストでフィルタリング | |
308309

309310
## リフログ

docs/keybindings/Keybindings_ko.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
2424
| `` R `` | 새로고침 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
2525
| `` + `` | 다음 스크린 모드 (normal/half/fullscreen) | |
2626
| `` _ `` | 이전 스크린 모드 | |
27+
| `` <esc> `` | 취소 | |
2728
| `` ? `` | 매뉴 열기 | |
2829
| `` <c-s> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |
2930
| `` W `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
@@ -129,7 +130,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
129130
| Key | Action | Info |
130131
|-----|--------|-------------|
131132
| `` <enter> `` | 실행 | |
132-
| `` <esc> `` | 닫기 | |
133+
| `` <esc> `` | 닫기/취소 | |
133134
| `` / `` | Filter the current view by text | |
134135

135136
## 메인 패널 (Merging)

docs/keybindings/Keybindings_nl.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
2424
| `` R `` | Verversen | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
2525
| `` + `` | Volgende scherm modus (normaal/half/groot) | |
2626
| `` _ `` | Vorige scherm modus | |
27+
| `` <esc> `` | Annuleren | |
2728
| `` ? `` | Open menu | |
2829
| `` <c-s> `` | Bekijk scoping opties | View options for filtering the commit log, so that only commits matching the filter are shown. |
2930
| `` W `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |

docs/keybindings/Keybindings_pl.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
2424
| `` R `` | Odśwież | Odśwież stan git (tj. uruchom `git status`, `git branch`, itp. w tle, aby zaktualizować zawartość paneli). To nie uruchamia `git fetch`. |
2525
| `` + `` | Następny tryb ekranu (normalny/półpełny/pełnoekranowy) | |
2626
| `` _ `` | Poprzedni tryb ekranu | |
27+
| `` <esc> `` | Anuluj | |
2728
| `` ? `` | Otwórz menu przypisań klawiszy | |
2829
| `` <c-s> `` | Pokaż opcje filtrowania | Pokaż opcje filtrowania dziennika commitów, tak aby pokazywane były tylko commity pasujące do filtra. |
2930
| `` W `` | Pokaż opcje różnicowania | Pokaż opcje dotyczące różnicowania dwóch refów, np. różnicowanie względem wybranego refa, wprowadzanie refa do różnicowania i odwracanie kierunku różnic. |
@@ -160,7 +161,7 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
160161
| Key | Action | Info |
161162
|-----|--------|-------------|
162163
| `` <enter> `` | Wykonaj | |
163-
| `` <esc> `` | Zamknij | |
164+
| `` <esc> `` | Zamknij/Anuluj | |
164165
| `` / `` | Filtruj bieżący widok po tekście | |
165166

166167
## Panel główny (normalny)

docs/keybindings/Keybindings_pt.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
2424
| `` R `` | Atualizar | Atualize o estado do git (ou seja, execute `git status`, `git branch`, etc em segundo plano para atualizar o conteúdo de painéis). Isso não executa `git fetch`. |
2525
| `` + `` | Next screen mode (normal/half/fullscreen) | |
2626
| `` _ `` | Prev screen mode | |
27+
| `` <esc> `` | Cancelar | |
2728
| `` ? `` | Open keybindings menu | |
2829
| `` <c-s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |
2930
| `` W `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
@@ -222,7 +223,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
222223
| Key | Action | Info |
223224
|-----|--------|-------------|
224225
| `` <enter> `` | Executar | |
225-
| `` <esc> `` | Fechar | |
226+
| `` <esc> `` | Fechar/Cancelar | |
226227
| `` / `` | Filter the current view by text | |
227228

228229
## Painel Principal (Normal)

docs/keybindings/Keybindings_ru.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _Связки клавиш_
2424
| `` R `` | Обновить | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
2525
| `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | |
2626
| `` _ `` | Предыдущий режим экрана | |
27+
| `` <esc> `` | Отменить | |
2728
| `` ? `` | Открыть меню | |
2829
| `` <c-s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |
2930
| `` W `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
@@ -228,7 +229,7 @@ _Связки клавиш_
228229
| Key | Action | Info |
229230
|-----|--------|-------------|
230231
| `` <enter> `` | Выполнить | |
231-
| `` <esc> `` | Закрыть | |
232+
| `` <esc> `` | Закрыть/отменить | |
232233
| `` / `` | Filter the current view by text | |
233234

234235
## Панель Подтверждения

docs/keybindings/Keybindings_zh-CN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
2424
| `` R `` | 刷新 | 刷新git状态(即在后台上运行`git status`,`git branch`等命令以更新面板内容) 不会运行`git fetch` |
2525
| `` + `` | 下一屏模式(正常/半屏/全屏) | |
2626
| `` _ `` | 上一屏模式 | |
27+
| `` <esc> `` | 取消 | |
2728
| `` ? `` | 打开菜单 | |
2829
| `` <c-s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项,以便仅显示与过滤器匹配的提交。 |
2930
| `` W `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项,例如与选定的 ref 进行比较,输入要比较的 ref,然后反转比较方向。 |

docs/keybindings/Keybindings_zh-TW.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _說明:`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B,`B`表示 Shift+B
2424
| `` R `` | 重新整理 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
2525
| `` + `` | 下一個螢幕模式(常規/半螢幕/全螢幕) | |
2626
| `` _ `` | 上一個螢幕模式 | |
27+
| `` <esc> `` | 取消 | |
2728
| `` ? `` | 開啟選單 | |
2829
| `` <c-s> `` | 檢視篩選路徑選項 | View options for filtering the commit log, so that only commits matching the filter are shown. |
2930
| `` W `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
@@ -120,7 +121,7 @@ _說明:`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B,`B`表示 Shift+B
120121
| Key | Action | Info |
121122
|-----|--------|-------------|
122123
| `` <enter> `` | 執行 | |
123-
| `` <esc> `` | 關閉 | |
124+
| `` <esc> `` | 關閉/取消 | |
124125
| `` / `` | 搜尋 | |
125126

126127
## 子提交

pkg/commands/hosting_service/definitions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ var azdoServiceDef = ServiceDefinition{
4646
pullRequestURLIntoTargetBranch: "/pullrequestcreate?sourceRef={{.From}}&targetRef={{.To}}",
4747
commitURL: "/commit/{{.CommitHash}}",
4848
regexStrings: []string{
49+
`^.+@vs-ssh\.visualstudio\.com[:/](?:v3/)?(?P<org>[^/]+)/(?P<project>[^/]+)/(?P<repo>[^/]+?)(?:\.git)?$`,
4950
`^[email protected].*/(?P<org>.*)/(?P<project>.*)/(?P<repo>.*?)(?:\.git)?$`,
5051
`^https://.*@dev.azure.com/(?P<org>.*?)/(?P<project>.*?)/_git/(?P<repo>.*?)(?:\.git)?$`,
5152
`^https://.*/(?P<org>.*?)/(?P<project>.*?)/_git/(?P<repo>.*?)(?:\.git)?$`,

0 commit comments

Comments
 (0)