59 commits

Author	SHA1	Message	Date
Henrik Lissner	143fdd17e1	Use insert mode only if git commit is empty	2018-07-29 17:42:00 +02:00
Henrik Lissner	d094162d31	Refactor how git-timemachine loads magit-blame ... Loading magit-blame immediately after git-timemachine is premature, only one command uses magit-blame (git-timemachine-blame), so we defer it until that command is called (also, it makes more sense to be in the emacs/vc module, than tools/magit).	2018-07-29 17:42:00 +02:00
Henrik Lissner	d6461d495b	General & minor reformatting+refactor	2018-07-19 03:40:31 +02:00
Henrik Lissner	e5125fbb26	Remove unused +vc-auto-hydra-smerge variable	2018-07-12 19:03:15 +02:00
Henrik Lissner	29c2632cab	Fix infinite recursion in smerge-mode #745 ... Also renames +hydra-smerge -> +vc-smerge-hydra, and no longer auto-enables the hydra on smerge-mode (must find a better way).	2018-07-09 21:50:19 +02:00
Henrik Lissner	3134df8f43	Refactor smerge-mode config ... Remove +vcs|enable-smerge-mode-maybe, as this is already automatically enabled when current file is has merge conflicts. Moved +hydra-smerge to autoloads file, and add it to smerge-mode-hook.	2018-06-26 01:32:05 +02:00
Henrik Lissner	3284356fc2	Move git-commit style settings to hook ... +vc|enforce-git-commit-conventions Also, use fill-column instead of git-commit-fill-column, which magit has deprecated.	2018-06-24 16:31:14 +02:00
Benjamin Andresen	61cdac230f	ui/vc emacs/vc: unify hydra design ... this design will also break less based on the fonts	2018-06-23 16:25:58 +02:00
Henrik Lissner	60779c9aed	feature/version-control => ui/vc-gutter, emacs/vc ... Reorganize vcs functionality. Moves the custom fringe bitmaps into :ui vc-gutter.	2018-06-22 01:49:20 +02:00

Renamed from modules/feature/version-control/config.el (Browse further)