projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: adbbc6f 07924d4)
Merge branch 'mp/diff-algo-config'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2013 23:25:51 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2013 23:25:52 +0000 (15:25 -0800)
commitabea4dc76a675d4ac0f27a2367256dc31981d1ca
tree07020dfe6fce37c742bc73700d651e117891a416tree | snapshot
parentadbbc6f29121aee3aec383a9ac05092c79908033commit | diff
parent07924d4d50e5304fb53eb60aaba8aef31d4c4e5ecommit | 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
Documentation/diff-config.txt diff1 | diff2 | blob | history
Documentation/diff-options.txt diff1 | diff2 | blob | history
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
Git—the stupid content tracker