diff options
| author | Eric Engestrom <eric@engestrom.ch> | 2020-07-29 13:27:51 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-08-19 22:28:28 +0200 |
| commit | ebfe0698ca8c3552351dd5486ad8d60df9a168cb (patch) | |
| tree | 89004b6cd16c11465d7227a6e548e4d58e975c82 | |
| parent | cad3caba1a5db7f3b7296af6f39217e016d9659e (diff) | |
pick-ui: specify git commands in "resolve cherry pick" message
Cc: mesa-stable
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6134>
(cherry picked from commit e3069c4257730acd09d30beb088291837ed0f884)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | bin/pick/ui.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 33d415ef8b6..6e8a18ac5f7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3649,7 +3649,7 @@ "description": "pick-ui: specify git commands in \"resolve cherry pick\" message", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/bin/pick/ui.py b/bin/pick/ui.py index 2d7b510703f..3afd05e0ca2 100644 --- a/bin/pick/ui.py +++ b/bin/pick/ui.py @@ -240,8 +240,8 @@ class UI: {err} - You can either cancel, or resolve the conflicts, commit the - changes and select ok.""")) + You can either cancel, or resolve the conflicts (`git mergetool`), finish the + cherry-pick (`git cherry-pick --continue`) and select ok.""")) can_btn = urwid.Button('Cancel') urwid.connect_signal(can_btn, 'click', reset_cb) |