diff options
| author | Alan Pearce | 2013-08-28 09:13:53 +0100 |
|---|---|---|
| committer | Alan Pearce | 2013-08-28 09:13:53 +0100 |
| commit | c57093f28708a30b9720221532db80a9446bba77 (patch) | |
| tree | 4d5fb8748463169cab6dcf2d592b755027ab75ab | |
| parent | b064712dfa6f4a3e727ad18568fc9f852c3e2c0d (diff) | |
| parent | 314c9708d77bf367b775bf71be374faa690bcb1f (diff) | |
| download | nixfiles-c57093f28708a30b9720221532db80a9446bba77.tar.lz nixfiles-c57093f28708a30b9720221532db80a9446bba77.tar.zst nixfiles-c57093f28708a30b9720221532db80a9446bba77.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
| -rw-r--r-- | emacs/elisp/ap-functions.el | 2 | ||||
| -rw-r--r-- | emacs/init.el | 6 | ||||
| -rw-r--r-- | gitconfig | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/emacs/elisp/ap-functions.el b/emacs/elisp/ap-functions.el index 104b4449..4c300015 100644 --- a/emacs/elisp/ap-functions.el +++ b/emacs/elisp/ap-functions.el @@ -44,3 +44,5 @@ "")) (command (read-shell-command "Shell command: " nil nil nil))) (shell-command (replace-regexp-in-string "%" file-buffer command) to-current-buffer))) + +(provide 'ap-functions) diff --git a/emacs/init.el b/emacs/init.el index 916cc420..1b7b4950 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -427,6 +427,12 @@ Values: `desktop', `server', `laptop'") (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 diff --git a/gitconfig b/gitconfig index 74d13ecb..0e4d5afe 100644 --- a/gitconfig +++ b/gitconfig @@ -18,4 +18,6 @@ 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 \ No newline at end of file + user = alan@alanpearce.co.uk +[diff] + algorithm = patience |