Commit 1345e584 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-commit to magit-commit-create

See #3619.
parent fc063924
......@@ -122,7 +122,7 @@ Also see `git-commit-post-finish-hook'."
(?S "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key)
(?C "Reuse commit message" "--reuse-message="
:actions ((?c "Commit" magit-commit)
:actions ((?c "Commit" magit-commit-create)
(?e "Extend" magit-commit-extend)
(?f "Fixup" magit-commit-fixup)
(?F "Instant Fixup" magit-commit-instant-fixup) nil
......@@ -132,7 +132,7 @@ Also see `git-commit-post-finish-hook'."
(?a "Amend" magit-commit-amend)
(?A "Augment" magit-commit-augment))
:max-action-columns 4
:default-action magit-commit))
:default-action magit-commit-create))
(magit-define-popup-keys-deferred 'magit-commit-popup)
......@@ -168,7 +168,7 @@ Also see `git-commit-post-finish-hook'."
;;; Commands
(defun magit-commit (&optional args)
(defun magit-commit-create (&optional args)
"Create a new commit on `HEAD'.
With a prefix argument, amend to the commit at `HEAD' instead.
\n(git commit [--amend] ARGS)"
......@@ -490,7 +490,7 @@ actually insert the entry."
(unless log
(unless (magit-commit-assert nil)
(user-error "Abort"))
(while (not (setq log (magit-commit-message-buffer)))
(sit-for 0.01)))
......@@ -45,7 +45,7 @@
(?s "Squash merge" magit-merge-squash)
(?a "Absorb" magit-merge-absorb)
(?i "Merge into" magit-merge-into))
:sequence-actions '((?m "Commit merge" magit-commit)
:sequence-actions '((?m "Commit merge" magit-commit-create)
(?a "Abort merge" magit-merge-abort))
:sequence-predicate 'magit-merge-in-progress-p
:default-action 'magit-merge
......@@ -45,6 +45,7 @@
(define-obsolete-function-alias 'magit-stash 'magit-stash-both "Magit 2.90.0")
(define-obsolete-function-alias 'magit-snapshot 'magit-snapshot-both "Magit 2.90.0")
(define-obsolete-function-alias 'magit-push 'magit-push-other "Magit 2.90.0")
(define-obsolete-function-alias 'magit-commit 'magit-commit-create "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment