diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2019-01-26 00:35:06 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2019-02-14 20:17:36 +0100 |
| commit | 139dfe86c16bb6c8a2cc012708c139adae2424e7 (patch) | |
| tree | afb5db9a013a5fa7222fd048407d36a3a6502cdc /lisp/magit-notes.el | |
| parent | 5257225bda20016a2491c8159890ad4f27b25370 (diff) | |
magit-{merge,notes}:--strategy: Define options explicitly
Diffstat (limited to 'lisp/magit-notes.el')
| -rw-r--r-- | lisp/magit-notes.el | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/magit-notes.el b/lisp/magit-notes.el index 345b71b..673160d 100644 --- a/lisp/magit-notes.el +++ b/lisp/magit-notes.el @@ -49,7 +49,7 @@ ("=r" "Manipulate ref" "--ref=" magit-notes-read-ref)] ["Arguments for merge" :if-not magit-notes-merging-p - ("=s" "Merge strategy" "--strategy=")] + (magit-notes:--strategy)] ["Actions" :if-not magit-notes-merging-p ("T" "Edit" magit-notes-edit) @@ -92,6 +92,14 @@ :reader 'magit-notes-read-refs :prompt "Set global notes.displayRef") +(define-infix-argument magit-notes:--strategy () + :description "Merge strategy" + :class 'transient-option + :key "=s" + :shortarg "-s" + :argument "--strategy=" + :choices '("manual" "ours" "theirs" "union" "cat_sort_uniq")) + (defun magit-notes-edit (commit &optional ref) "Edit the note attached to COMMIT. REF is the notes ref used to store the notes. |