diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2025-05-11 22:50:29 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-05-11 22:50:29 +0200 |
| commit | 621e69eb9bc3379511d5e6b8bb82094ef8e71cfa (patch) | |
| tree | 653a8707ccbed74d4092c7636572596fc24bb1e6 /lisp | |
| parent | a6b968f82f0d68890d5299a4193cfbdaadf62a16 (diff) | |
magit-rebase-insert-merge-sequence: Skip over empty lines
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/magit-sequence.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el index 0c8fecb..1b3d08e 100644 --- a/lisp/magit-sequence.el +++ b/lisp/magit-sequence.el @@ -1024,7 +1024,7 @@ status buffer (i.e., the reverse of how they will be applied)." ((or 'commit (and 'merge (guard abbrev))) (magit-sequence-insert-commit action target 'magit-sequence-pick abbrev trailer)) - (_ (magit-sequence-insert-step action target))))) + ((guard action) (magit-sequence-insert-step action target))))) (let ((dir (magit-gitdir))) (magit-sequence-insert-sequence (magit-file-line (expand-file-name "rebase-merge/stopped-sha" dir)) |