![[PukiWiki]](image/tux_100x119.jpg "[PukiWiki]")
(setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/dash") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/ghub") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/git-modes") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/graphql") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/magit-popup") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/transient/lisp") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/treepy") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/with-editor/lisp") load-path)) (setq load-path (cons (expand-file-name "~/.emacs.d/site-lisp/magit/lisp") load-path)) (require 'magit)
magit/config.mk: LOAD_PATH = -L ~/.emacs.d/site-lisp/magit/lisp LOAD_PATH += -L ~/.emacs.d/site-lisp/dash LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp LOAD_PATH += -L ~/.emacs.d/site-lisp/with-editor
| binding | command | description | remark |
|---|---|---|---|
| b | magit-branching | ブランチ操作 | |
| y | magit-show-refs-popup | ブランチ一覧 | |
| C-j | magit-diff-visit-worktree-file | ||
| C | magit-commit-add-log | ||
| K | magit-file-untrack | ||
| R | magit-file-rename | ||
| a | magit-apply | ||
| s | magit-stage | ||
| u | magit-unstage | ||
| <C-return> | magit-diff-visit-file-worktree | ||
| <remap> | Prefix Command | ||
| C-c C-e | magit-diff-edit-hunk-commit | ||
| C-c C-t | magit-diff-trace-definition | ||
| <remap> <magit-delete-thing> | magit-discard | ||
| <remap> <magit-revert-no-commit> | magit-reverse | ||
| <remap> <magit-visit-thing> | magit-diff-visit-file | ||
| C-x a | magit-add-change-log-entry | ||
| C-x 5 <return> | magit-diff-visit-file-other-frame | ||
| C-x 4 a | magit-add-change-log-entry-other-window | ||
| C-x 4 <return> | magit-diff-visit-file-other-window |
| binding | command | remark |
|---|---|---|
| C-c | Prefix Command | |
| TAB | magit-section-toggle | |
| RET | magit-visit-thing | |
| C-w | magit-copy-section-value | |
| ESC | Prefix Command | |
| SPC | magit-diff-show-or-scroll-up | |
| ! | magit-run | |
| $ | magit-process-buffer | |
| % | magit-worktree | |
| + | magit-diff-more-context | |
| - | magit-diff-less-context | |
| 0 | magit-diff-default-context | |
| 1 | magit-section-show-level-1 | |
| 2 | magit-section-show-level-2 | |
| 3 | magit-section-show-level-3 | |
| 4 | magit-section-show-level-4 | |
| 5 .. 9 | digit-argument | |
| : | magit-git-command | |
| < | beginning-of-buffer | |
| > | end-of-buffer | |
| ? | magit-dispatch | |
| A | magit-cherry-pick | git cherry-pic の操作メニューを表示 |
| B | magit-bisect | |
| D | magit-diff-refresh | |
| E | magit-ediff | git diff の操作メニューを表示する |
| F | magit-pull | pull の操作メニュー・・・は表示されないが、 F u: magit-pull-from-upstream F p: magit-pull-from-pushremote F e: magit-pull-branch がそれぞれ実行出来る。 |
| G | magit-refresh-all | |
| H | magit-describe-section | git describe を実行（一番最新の tag からの commit 情報を表示する） |
| I | magit-gitignore | |
| L | magit-log-refresh | |
| M | magit-remote | git remote の操作メニューを表示 |
| O | magit-subtree | |
| P | magit-push | git push の操作メニューを表示 |
| S | magit-stage-modified | |
| T | magit-notes | |
| U | magit-unstage-all | stage されている全てのファイルを unstage する |
| V | magit-revert | |
| W | magit-patch | |
| X | magit-reset | git reset の操作メニューを表示 |
| Y | magit-cherry | |
| Z | magit-stash | git stash の操作メニューを表示 |
| ^ | magit-section-up | |
| b | magit-branch | git branch の操作メニューを表示 |
| b b | magit-checkout | 任意のブランチを checkout する |
| c | magit-commit | git commit の操作メニューを表示 |
| d | magit-diff | |
| e | magit-ediff-compare | |
| f | magit-fetch | |
| g | magit-refresh | |
| h | magit-dispatch | |
| i | magit-gitignore | |
| j | magit-status-jump | |
| k | magit-delete-thing | |
| l | magit-log | git log の操作メニューを表示 |
| m | magit-merge | |
| n | magit-section-forward | |
| o | magit-submodule | |
| p | magit-section-backward | |
| q | magit-mode-bury-buffer | |
| r | magit-rebase | |
| t | magit-tag | git tag の操作メニューを表示 |
| v | magit-revert-no-commit | |
| w | magit-am | |
| x | magit-reset-quickly | |
| y | magit-show-refs | branch 操作の操作メニューを表示。機能としては v.2.1.0 での magit-branch-popup に近い。 |
| z | magit-stash | git stash の操作メニューを表示 |
| DEL | magit-diff-show-or-scroll-down | |
| S-SPC | ||
| <C-tab> | magit-section-cycle | |
| <M-tab> | magit-section-cycle-diffs | |
| <backtab> | magit-section-cycle-global | |
| <remap> | Prefix Command | |
| <s-tab> | magit-section-cycle-global | |
| <remap> <dired-jump> | magit-dired-jump | |
| C-c C-c | magit-dispatch | |
| C-c C-o | magit-browse-thing | |
| C-c C-w | ||
| C-M-i | magit-dired-jump | |
| M-w | magit-copy-buffer-revision | |
| M-1 | magit-section-show-level-1-all | |
| M-2 | magit-section-show-level-2-all | |
| M-3 | magit-section-show-level-3-all | |
| M-4 | magit-section-show-level-4-all | |
| M-n | magit-section-forward-sibling | |
| M-p | magit-section-backward-sibling |
| 画面 | 関数 |
|---|---|
| 2ペイン | magit-ediff-compare |
| 3ペイン | magit-ediff-dwim |
(define-key magit-mode-map "e" 'magit-ediff-compare)
(eval-after-load "magit-log"
'(progn
(custom-set-variables
'(magit-log-margin '(t "%Y-%m-%d %H:%M:%S " magit-log-margin-width t 18)))))(custom-set-faces '(magit-hash ((t (:foreground "white")))) ; log の commit ID 文字色 ;'(magit-section-highlight ((t (:background "blue")))) ; highlight )
