Initial support for git svn.
This commit is contained in:
parent
4e8ff13fbb
commit
2007a3714e
1 changed files with 17 additions and 0 deletions
17
magit.el
17
magit.el
|
@ -934,6 +934,10 @@ Many Magit faces inherit from this one by default."
|
||||||
["Merge" magit-automatic-merge t]
|
["Merge" magit-automatic-merge t]
|
||||||
["Merge (no commit)" magit-manual-merge t]
|
["Merge (no commit)" magit-manual-merge t]
|
||||||
["Rebase" magit-rebase-step t]
|
["Rebase" magit-rebase-step t]
|
||||||
|
("Git SVN"
|
||||||
|
["Rebase" magit-svn-rebase (magit-svn-enabled)]
|
||||||
|
["Commit" magit-svn-dcommit (magit-svn-enabled)]
|
||||||
|
)
|
||||||
("Rewrite"
|
("Rewrite"
|
||||||
["Start" magit-rewrite-start t]
|
["Start" magit-rewrite-start t]
|
||||||
["Stop" magit-rewrite-stop t]
|
["Stop" magit-rewrite-stop t]
|
||||||
|
@ -1572,6 +1576,19 @@ Please see the manual for a complete description of Magit.
|
||||||
((?C ?c)
|
((?C ?c)
|
||||||
(magit-run "git" "rebase" "--continue"))))))))
|
(magit-run "git" "rebase" "--continue"))))))))
|
||||||
|
|
||||||
|
;; git svn commands
|
||||||
|
|
||||||
|
(defun magit-svn-rebase ()
|
||||||
|
(interactive)
|
||||||
|
(magit-run "git" "svn" "rebase"))
|
||||||
|
|
||||||
|
(defun magit-svn-dcommit ()
|
||||||
|
(interactive)
|
||||||
|
(magit-run "git" "svn" "dcommit"))
|
||||||
|
|
||||||
|
(defun magit-svn-enabled ()
|
||||||
|
(not (null (find "git-svn" (magit-list-interesting-revisions) :test 'equal))))
|
||||||
|
|
||||||
;;; Resetting
|
;;; Resetting
|
||||||
|
|
||||||
(defun magit-reset-head (rev)
|
(defun magit-reset-head (rev)
|
||||||
|
|
Loading…
Add table
Reference in a new issue