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

Remove the merging functions from branch view for the time being (needs refactoring).

Browse source
This commit is contained in:
Phil Jackson 2010-11-02 16:50:57 +00:00
parent e5ae16c1d7
commit e461c39b92
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
magit.el
View file

@ -4206,8 +4206,6 @@ Return values:
(define-key map (kbd "RET") 'magit-branches-window-checkout)
(define-key map (kbd "b") 'magit-branches-window-checkout)
(define-key map (kbd "k") 'magit-remove-branch)
(define-key map (kbd "m") 'magit-branches-window-manual-merge)
(define-key map (kbd "M") 'magit-branches-window-automatic-merge)
(define-key map (kbd "$") 'magit-display-process)
(define-key map (kbd "q") 'magit-quit-branches-window)
(define-key map (kbd "g") 'magit-show-branches)
@ -4261,18 +4259,6 @@ With prefix force the removal even it it hasn't been merged."
(apply 'magit-run-git (remq nil args))
(magit-show-branches))))
(defun magit-branches-window-manual-merge ()
"Merge the branch at point manually."
(interactive)
(magit-manual-merge (magit--branch-name-at-point))
(magit-show-branches))
(defun magit-branches-window-automatic-merge ()
"Merge the branch at point automatically."
(interactive)
(magit-automatic-merge (magit--branch-name-at-point))
(magit-show-branches))
(defvar magit-branches-buffer-name "*magit-branches*")
(defun magit--is-branch-at-point-remote()