Module: Mesa Branch: staging/20.1 Commit: ac8db57a59ccc89e44b807f07e1e4ef55397c80f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac8db57a59ccc89e44b807f07e1e4ef55397c80f
Author: Eric Engestrom <[email protected]> Date: Wed Jul 29 13:27:51 2020 +0200 pick-ui: specify git commands in "resolve cherry pick" message Cc: mesa-stable Signed-off-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6134> (cherry picked from commit e3069c4257730acd09d30beb088291837ed0f884) --- .pick_status.json | 2 +- bin/pick/ui.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 78b63342dd2..bf0aeebf189 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -31,7 +31,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) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
