blob: 1fca8cdb5f49c4510fc1741618d740e1ef888218 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
(add-to-list 'load-path "~/src/emacs/git-modes")
(add-to-list 'load-path "~/src/emacs/magit")
(require 'magit-autoloads)
(require 'git-modes-autoloads)
(require-package 'git-annex)
(require 'git-annex)
(require-package 'git-timemachine)
(setq git-annex-commit nil)
(require 'magit-annex-autoloads)
(key-chord-define-global ",g" 'magit-status)
(defun km/magit-auto-commit ()
"Commit all changes with \"auto\" commit message.
Useful for non-source code repos (e.g., Org mode note files)."
(interactive)
(magit-run-git "commit" "--all" "--message=auto"))
(defun km/magit-push-all ()
"Push all branches."
(interactive)
(let ((remote (magit-read-remote "Remote")))
(magit-run-git-async "push" "-v" remote "--all")))
(defun km/magit-log-all-branches (range &optional args)
(interactive (magit-log-read-args t nil))
(add-to-list 'args "--all")
(magit-log-dwim range args))
(defun km/magit-checkout-local-tracking (remote-branch)
"Create and checkout a local tracking branch for REMOTE-BRANCH.
\n(git checkout -t REMOTE-BRANCH\)"
(interactive
(list (magit-completing-read "Remote branch"
(magit-list-remote-branch-names))))
(magit-run-git "checkout" "-t" remote-branch))
(defun km/magit-checkout-previous-branch ()
"Checkout previous branch.
\n(git checkout -)"
(interactive)
(magit-run-git "checkout" "-"))
(defun km/magit-checkout-master ()
"Checkout master branch.
\n(git checkout master)"
(interactive)
(magit-run-git "checkout" "master"))
(defun km/magit-branch-and-checkout-from-current (branch)
"Create and checkout BRANCH at current branch.
This is equivalent to running `magit-branch-and-checkout' with
START-POINT set to the current branch.
\n(git checkout -b BRANCH)"
(interactive (list (magit-read-string "Branch name")))
(magit-run-git "checkout" "-b" branch))
(defun km/magit-backup-branch ()
"Create a backup branch for the current branch.
\n(git branch b/<current-branch>)"
(interactive)
(-if-let (current-branch (magit-get-current-branch))
(magit-run-git "branch" (concat "b/" current-branch))
(user-error "No current branch")))
;; http://whattheemacsd.com/setup-magit.el-01.html
(defadvice magit-status (around magit-fullscreen activate)
ad-do-it
(delete-other-windows))
(setq magit-restore-window-configuration t
magit-completing-read-function 'magit-ido-completing-read
magit-popup-show-help-echo nil
magit-popup-show-help-section nil
magit-popup-use-prefix-argument 'default
magit-log-show-margin nil)
(setq vc-follow-symlinks t)
(after 'git-commit-mode
(add-hook 'git-commit-setup-hook 'git-commit-turn-on-flyspell))
(after 'magit
(add-hook 'magit-find-file-hook 'view-mode)
(define-key magit-popup-mode-map (kbd "SPC <t>") 'magit-invoke-popup-switch)
(define-key magit-popup-mode-map (kbd "SPC SPC <t>") 'magit-invoke-popup-option)
(define-key magit-mode-map (kbd "C-c m") 'km/magit-prefix-map)
;; Remove `magit-add-change-log-entry-other-window', which overrides
;; my binding for `km/zsh-ansi-term-other-window'.
(define-key magit-mode-map (kbd "C-x 4 a") nil)
(magit-define-popup-action 'magit-commit-popup
?u "Auto commit" 'km/magit-auto-commit)
(magit-define-popup-action 'magit-push-popup
?a "Push all" 'km/magit-push-all)
(magit-define-popup-action 'magit-log-popup
?a "All branches" 'km/magit-log-all-branches)
(magit-define-popup-action 'magit-branch-popup
?t "Local tracking" 'km/magit-checkout-local-tracking)
(magit-define-popup-action 'magit-branch-popup
?s "Backup current branch" 'km/magit-backup-branch)
(magit-define-popup-action 'magit-branch-popup
?C "Create" 'magit-branch)
(magit-define-popup-action 'magit-branch-popup
?c "Create & checkout from current"
'km/magit-branch-and-checkout-from-current)
(magit-define-popup-action 'magit-branch-popup
?p "Checkout previous" 'km/magit-checkout-previous-branch)
(magit-define-popup-action 'magit-branch-popup
?m "Checkout master" 'km/magit-checkout-master)
(defadvice magit-merge-editmsg (around km/magit-merge-editmsg-no-ff activate)
"Set '--no-ff' flag when running `magit-merge-editmsg'."
(let ((args '("--no-ff")))
ad-do-it))
(setq magit-branch-arguments
(delete "--track" magit-branch-arguments)))
(define-key ctl-x-4-map "g" 'magit-find-file-other-window)
(define-key km/file-map "g" 'magit-find-file)
(provide 'init-git)
|