Junio C Hamano 39f1b89adc Merge branch 'jk/diff' into next ...

* jk/diff:
  git-commit.sh: convert run_status to a C builtin
  Move color option parsing out of diff.c and into color.[ch]
  diff: support custom callbacks for output
  autoconf: Add config.cache to .gitignore
  autoconf: Add support for setting NO_ICONV and ICONVDIR
  autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv

2006-09-08 17:36:33 -07:00

64 KiB

Raw Blame History

View Raw