diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-09 02:07:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-09 02:07:33 -0700 |
| commit | 910a5916b40575501b452a61e6447f96e77ec95e (patch) | |
| tree | 41b25df94573acb5c2530e8f19f3b9ba38163080 /Makefile | |
| parent | 3381c790e5ca04326d26e1dd9ff482961c6e425b (diff) | |
| parent | 52b70d56bd23811003a72866cc23a0a44b9da1b7 (diff) | |
| download | git-910a5916b40575501b452a61e6447f96e77ec95e.tar.gz git-910a5916b40575501b452a61e6447f96e77ec95e.tar.xz | |
Merge branch 'jc/diff' into next
* jc/diff:
git log [diff-tree options]...
log-tree: separate major part of diff-tree.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -194,12 +194,12 @@ LIB_H = \ blob.h cache.h commit.h csum-file.h delta.h \ diff.h object.h pack.h pkt-line.h quote.h refs.h \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ - tree-walk.h + tree-walk.h log-tree.h DIFF_OBJS = \ diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \ diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \ - diffcore-delta.o + diffcore-delta.o log-tree.o LIB_OBJS = \ blob.o commit.o connect.o csum-file.o \ |