commit | abea4dc76a675d4ac0f27a2367256dc31981d1ca | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Sun Feb 17 15:25:51 2013 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Sun Feb 17 15:25:52 2013 -0800 |
tree | 07020dfe6fce37c742bc73700d651e117891a416 | |
parent | adbbc6f29121aee3aec383a9ac05092c79908033 [diff] | |
parent | 07924d4d50e5304fb53eb60aaba8aef31d4c4e5e [diff] |
Merge branch 'mp/diff-algo-config' Add diff.algorithm configuration so that the user does not type "diff --histogram". * mp/diff-algo-config: diff: Introduce --diff-algorithm command line option config: Introduce diff.algorithm variable git-completion.bash: Autocomplete --minimal and --histogram for git-diff