gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put back the automatic merge function for branch menu.

Browse source 
Closes #57.
This commit is contained in:
Phil Jackson 2010-09-16 22:33:29 +01:00
parent 6541af799d
commit 08ebe7dfcd
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
magit.el
View file

@ -2682,6 +2682,13 @@ insert a line to tell how to insert more of them"
(magit-mode-init topdir 'status #'magit-refresh-status) (magit-mode-init topdir 'status #'magit-refresh-status)
(magit-status-mode t))))) (magit-status-mode t)))))
(magit-define-command automatic-merge (revision)
"Merge REVISION into the current 'HEAD'; commit unless merge fails.
\('git merge REVISION')."
(interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
(if revision
(magit-run-git "merge" (magit-rev-to-git revision))))
;;; Staging and Unstaging ;;; Staging and Unstaging
(defun magit-stage-item () (defun magit-stage-item ()