From ed379819489db2b257d51f024c0518fb5beb804c Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Wed, 21 Feb 2018 19:27:33 -0500 Subject: Git config merge.conflictStyle diff3 This is probably a good idea, though I haven't run into a merge conflict yet. --- home/.config/git/config | 3 +++ 1 file changed, 3 insertions(+) (limited to 'home/.config/git/config') diff --git a/home/.config/git/config b/home/.config/git/config index cb38682c..5780def4 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -5,6 +5,9 @@ [commit] gpgSign = true +[merge] + conflictStyle = diff3 + [rebase] autosquash = true -- cgit 1.4.1 hange='this.form.submit();'> IRC client
about summary refs log tree commit diff
path: root/tag.c (unfollow)
Commit message (Collapse)Author
2018-09-12Add note about C-oJune McEnroe
Why are there so few well usable ctrl key bindings?
2018-09-12Use formatParse split to position input cursorJune McEnroe
2018-09-12Factor out IRC formatting parsingJune McEnroe
2018-09-11Add /help equivalent to /manJune McEnroe
2018-09-11Don't render every PM as a pingJune McEnroe
2018-09-11Add urlOpenMatchJune McEnroe
2018-09-10Depend on man.sh for chroot.tar targetJune McEnroe
2018-09-10Set LESSSECURE=1 in man.shJune McEnroe
Ridiculous.
2018-09-10Add /man commandJune McEnroe
2018-09-10Install man page in chrootJune McEnroe
2018-09-10Install man pageJune McEnroe
2018-09-10Split keys into subsections and document colorsJune McEnroe
2018-09-10Add "blank" lines to chatte.1June McEnroe
2018-09-10Document key bindings in chatte.1June McEnroe
2018-09-08Document slash commands in chatte.1June McEnroe