Merge remote-tracking branch 'refs/remotes/origin/master'
3 files changed, 11 insertions(+), 1 deletion(-)
M emacs/elisp/ap-functions.el → emacs/elisp/ap-functions.el
@@ -44,3 +44,5 @@ (file-name-nondirectory (buffer-file-name)) "")) (command (read-shell-command "Shell command: " nil nil nil))) (shell-command (replace-regexp-in-string "%" file-buffer command) to-current-buffer))) + +(provide 'ap-functions)
M emacs/init.el → emacs/init.el
@@ -427,6 +427,12 @@ :config (progn (add-to-list 'tramp-remote-path "/usr/local/sbin") (add-to-list 'tramp-remote-path "~/bin"))) +(use-package ediff + :defer t + :config (progn + (setq ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain))) + ;;;; Indentation (setq-default tab-width 4
M gitconfig → gitconfig
@@ -18,4 +18,6 @@ lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --since yesterday --author alan ignored = ls-files --others -i --exclude-standard [github] - user = alan@alanpearce.co.uk+ user = alan@alanpearce.co.uk +[diff] + algorithm = patience