From: Junio C Hamano <junkio@cox.net>
Date: Mon, 18 Sep 2006 01:14:03 +0000 (-0700)
Subject: Merge branch 'jk/diff'
X-Git-Tag: v1.4.3-rc1~84
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b467fb0b909883f28c4653361ccfa530ccf1a03e;p=git.git

Merge branch 'jk/diff'

* jk/diff:
  wt-status: remove extraneous newline from 'deleted:' output
  git-status: document colorization config options
  Teach runstatus about --untracked
  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
---

b467fb0b909883f28c4653361ccfa530ccf1a03e