diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-10 16:44:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-10 16:44:59 -0700 |
| commit | 6d46a23bf6e009487166f044b8c759aa734b8f90 (patch) | |
| tree | b6b3d18ff7a60585921674bc043fe6dd514a3f8c /Makefile | |
| parent | 52b70d56bd23811003a72866cc23a0a44b9da1b7 (diff) | |
| parent | 5910e997754e0a03f25457965bd9faf80f2f9854 (diff) | |
| download | git-6d46a23bf6e009487166f044b8c759aa734b8f90.tar.gz git-6d46a23bf6e009487166f044b8c759aa734b8f90.tar.xz | |
Merge branch 'master' into jc/diff
* master:
Make "--parents" logs also be incremental
Retire diffcore-pathspec.
Improve the git-diff-tree -c/-cc documentation
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -197,7 +197,7 @@ LIB_H = \ tree-walk.h log-tree.h DIFF_OBJS = \ - diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \ + diff.o diffcore-break.o diffcore-order.o \ diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \ diffcore-delta.o log-tree.o |