Merge remote-tracking branch 'refs/remotes/origin/master'
1 file changed, 3 insertions(+), 1 deletion(-)
changed files
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