diff options
| author | Eric Engestrom <eric@engestrom.ch> | 2020-07-29 13:27:51 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-08-11 09:35:47 -0700 |
| commit | 7665280b288ed31e8471fce3e4724f94680b4be1 (patch) | |
| tree | 84bd0e0fdbf5b2f12ee8560f2558922601df67d4 /bin | |
| parent | a6ccd24636b4acf167b055a94b8ae1167ec28c5f (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)
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/pick/ui.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) |