diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2017-05-21 14:41:56 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2017-05-22 21:29:31 -0400 |
| commit | 986de740cd8ee4017740c7337048d6b2c885dfcf (patch) | |
| tree | 72b0619259ed3568501dbf178f864ef0287bd3d1 /lisp/magit-subtree.el | |
| parent | 0679c015a9255c848cd4d9d8a71828ba45887590 (diff) | |
magit-subtree-{add,pull}: rename COMMIT parameter to REF
REF is consistent with the name used in git-subtree's manpage, and,
more importantly, is a better representation of what 'git subtree add
<repo> <arg>' and 'git subtree pull <repo> <arg>' expect for <arg>.
These forms in general work with a ref and will fail when given a hash
unless that object happens to already be in the local repository.
Diffstat (limited to 'lisp/magit-subtree.el')
| -rw-r--r-- | lisp/magit-subtree.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/magit-subtree.el b/lisp/magit-subtree.el index 494ff7c..241734a 100644 --- a/lisp/magit-subtree.el +++ b/lisp/magit-subtree.el @@ -88,13 +88,13 @@ (magit-run-git-async "subtree" subcmd (concat "--prefix=" prefix) args)) ;;;###autoload -(defun magit-subtree-add (prefix repository commit args) - "Add COMMIT from REPOSITORY as a new subtree at PREFIX." +(defun magit-subtree-add (prefix repository ref args) + "Add REF from REPOSITORY as a new subtree at PREFIX." (interactive (list (magit-subtree-prefix "Add subtree") (magit-read-string-ns "Repository") - (magit-read-string-ns "Commit") + (magit-read-string-ns "Ref") (magit-subtree-args))) - (magit-git-subtree "add" prefix args repository commit)) + (magit-git-subtree "add" prefix args repository ref)) ;;;###autoload (defun magit-subtree-add-commit (prefix commit args) @@ -113,13 +113,13 @@ (magit-git-subtree "merge" prefix args commit)) ;;;###autoload -(defun magit-subtree-pull (prefix repository commit args) - "Pull COMMIT from REPOSITORY into the PREFIX subtree." +(defun magit-subtree-pull (prefix repository ref args) + "Pull REF from REPOSITORY into the PREFIX subtree." (interactive (list (magit-subtree-prefix "Pull into subtree") (magit-read-string-ns "From repository") - (magit-read-string-ns "Commit") + (magit-read-string-ns "Ref") (magit-subtree-args))) - (magit-git-subtree "pull" prefix args repository commit)) + (magit-git-subtree "pull" prefix args repository ref)) ;;;###autoload (defun magit-subtree-push (prefix repository ref args) |