diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-17 18:14:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-17 18:14:03 -0700 |
| commit | b467fb0b909883f28c4653361ccfa530ccf1a03e (patch) | |
| tree | a84b4c34ef9cbf3e342a81ae14e7009a908cf2c7 /Makefile | |
| parent | ac8e3f2bb8a790ca7810df18c3282d07e84ae345 (diff) | |
| parent | db830b4f233bd45e28592fbf59395bc98d79dec5 (diff) | |
| download | git-b467fb0b909883f28c4653361ccfa530ccf1a03e.tar.gz git-b467fb0b909883f28c4653361ccfa530ccf1a03e.tar.xz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -253,7 +253,8 @@ LIB_OBJS = \ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \ fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \ write_or_die.o trace.o \ - alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) + alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \ + color.o wt-status.o BUILTIN_OBJS = \ builtin-add.o \ @@ -288,6 +289,7 @@ BUILTIN_OBJS = \ builtin-rev-list.o \ builtin-rev-parse.o \ builtin-rm.o \ + builtin-runstatus.o \ builtin-show-branch.o \ builtin-stripspace.o \ builtin-symbolic-ref.o \ |