projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 459d600 a79b8b6)
Merge branch 'jk/diff-convfilter'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:50:58 +0000 (21:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:50:58 +0000 (21:50 -0800)
commit72b6157aa847615a778ac9950e87dde109afa50c
tree691238c7db13ab8a743807731a44e3c493973c25tree | snapshot
parent459d60084fa463203d0adfc99cbf5d6fcd7edd43commit | diff
parenta79b8b6623288f7d5409ad749cc6553976a4f0e8commit | diff
Merge branch 'jk/diff-convfilter'

* jk/diff-convfilter:
  enable textconv for diff in verbose status/commit
  wt-status: load diff ui config
  only textconv regular files
  userdiff: require explicitly allowing textconv
  refactor userdiff textconv code

Conflicts:
t/t4030-diff-textconv.sh
builtin-diff.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
t/t4030-diff-textconv.sh diff1 | diff2 | blob | history
Git—the stupid content tracker