jcs.org / dotfiles
ftp -o - https://jcs.org/move_in | sh -
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

gitconfig: i don't like diff3 merging, show diff in commit

joshua stein dd8e62d3 01116ac9

+2 -2
+2 -2
.gitconfig
··· 9 9 fixup = rebase -i HEAD~5 10 10 tree = log --graph --pretty=format:'[%h] [%<(8,trunc)%al] [%cs] %<(50,trunc)%s' --abbrev-commit 11 11 touch = commit --amend --reset-author --no-edit 12 - [merge] 13 - conflictstyle = diff3 12 + [commit] 13 + verbose = true 14 14 [push] 15 15 default = simple 16 16 [color]