Merge branch 'jk/diff'
commitb467fb0b909883f28c4653361ccfa530ccf1a03e
authorJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 01:14:03 +0000 (17 18:14 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 01:14:03 +0000 (17 18:14 -0700)
treea84b4c34ef9cbf3e342a81ae14e7009a908cf2c7
parentac8e3f2bb8a790ca7810df18c3282d07e84ae345
parentdb830b4f233bd45e28592fbf59395bc98d79dec5
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
.gitignore
Makefile
builtin.h
diff.c
git.c